--- /usr/local/etc/xdg/xfce4/xinitrc	2012-05-26 22:40:36.000000000 +1000
+++ /home/fred/.config/xfce4/xinitrc	2012-05-30 18:14:04.000000000 +1000
@@ -81,6 +81,17 @@
 # load local modmap
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
 
+# Use dbus-launch if installed.
+if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
+  if which dbus-launch >/dev/null 2>&1; then
+    eval `dbus-launch --sh-syntax --exit-with-session`
+    # some older versions of dbus don't export the var properly
+    export DBUS_SESSION_BUS_ADDRESS
+  else
+    echo "Could not find dbus-launch; Xfce will not work properly" >&2
+    fi
+fi
+
 # run xfce4-session if installed
 if which xfce4-session >/dev/null 2>&1; then
 
@@ -118,17 +129,6 @@
 
 ##################
 
-# Use dbus-launch if installed.
-if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
-  if which dbus-launch >/dev/null 2>&1; then
-    eval `dbus-launch --sh-syntax --exit-with-session`
-    # some older versions of dbus don't export the var properly
-    export DBUS_SESSION_BUS_ADDRESS
-  else
-    echo "Could not find dbus-launch; Xfce will not work properly" >&2
-    fi
-fi
-
 # this is only necessary when running w/o xfce4-session
 xsetroot -solid black -cursor_name watch