diff --git a/Makefile.am b/Makefile.am
index ba4149c..61cf4c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,9 @@ openbox_DATA= \
 	openbox/rc.xml \
 	openbox/menu.xml
 
-pcmanfmdir=$(datadir)/lxde/pcmanfm
+pcmanfmdir=$(sysconfdir)/xdg/pcmanfm
 pcmanfm_DATA= \
-	pcmanfm/main.lxde
+	pcmanfm/lxde.conf
 
 EXTRA_DIST = \
 	autostart \
@@ -45,7 +45,7 @@ EXTRA_DIST = \
 	openbox/rc.xml.in \
 	openbox/menu.xml \
 	openbox-lxde.in \
-	pcmanfm/main.lxde.in \
+	pcmanfm/lxde.conf.in \
 	$(lxpanel_DATA) \
 	lxpanel/panel.in
 
diff --git a/autostart b/autostart
index 17d7b58..d5b6514 100644
--- a/autostart
+++ b/autostart
@@ -1,3 +1,3 @@
-@xscreensaver -no-splash
 @lxpanel --profile LXDE
-@pcmanfm -d
+@pcmanfm --desktop --profile lxde
+@xscreensaver -no-splash
diff --git a/configure.ac b/configure.ac
index 3b62903..f90b4c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(lxde-common,[0.5.0], [],lxde-common)
+AC_INIT(lxde-common,[0.5.5], [],lxde-common)
 AM_INIT_AUTOMAKE()
 dnl AC_PROG_INTLTOOL(, [no-xml])
 dnl AM_MAINTAINER_MODE
@@ -48,7 +48,16 @@ AC_OUTPUT([
   lxpanel/panel
   openbox/rc.xml
   openbox-lxde
-  pcmanfm/main.lxde
+  pcmanfm/lxde.conf
   man/Makefile
 ])
 
+if test x"$sysconfdir" != x'/etc'; then
+    echo
+    echo
+    echo 'Error: sysconfdir is not /etc.'
+    echo 'Please consider passing --sysconfdir=/etc to configure.';
+    echo 'Otherwise default config files will be installed to wrong place.'
+    echo
+    echo
+fi
diff --git a/lxpanel/config b/lxpanel/config
index 1911551..cb7f06d 100644
--- a/lxpanel/config
+++ b/lxpanel/config
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
-Terminal=xterm -e
+Terminal=lxterminal
 Logout=lxde-logout
diff --git a/openbox-lxde b/openbox-lxde
old mode 100755
new mode 100644
diff --git a/openbox/menu.xml b/openbox/menu.xml
index 78099e6..a7768a5 100644
--- a/openbox/menu.xml
+++ b/openbox/menu.xml
@@ -25,7 +25,7 @@
   <item label="Desktop Settings">
     <action name="Execute">
       <startupnotify><enabled>yes</enabled></startupnotify>
-      <command>pcmanfm --show-pref 2</command>
+      <command>pcmanfm --desktop-pref</command>
     </action>
   </item>
   <item label="Window Management Settings">
@@ -43,4 +43,4 @@
   </item>
 </menu>
 
-</openbox_menu>
\ No newline at end of file
+</openbox_menu>
diff --git a/pcmanfm/lxde.conf.in b/pcmanfm/lxde.conf.in
new file mode 100644
index 0000000..6799e1f
--- /dev/null
+++ b/pcmanfm/lxde.conf.in
@@ -0,0 +1,20 @@
+[config]
+bm_open_method=0
+su_cmd=xdg-su -c '%s'
+
+[desktop]
+wallpaper_mode=1
+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+
+[ui]
+always_show_tabs=0
+hide_close_btn=0
+win_width=640
+win_height=480
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=0
diff --git a/pcmanfm/main.lxde.in b/pcmanfm/main.lxde.in
deleted file mode 100644
index a619852..0000000
--- a/pcmanfm/main.lxde.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop]
-show_wallpaper=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
diff --git a/startlxde.in b/startlxde.in
index 8372d3a..f493e28 100755
--- a/startlxde.in
+++ b/startlxde.in
@@ -1,28 +1,43 @@
 #!/bin/sh
 
 if [ -z "$XDG_CONFIG_HOME" ]; then
-    export XDG_CONFIG_HOME="$HOME/.config"
+	export XDG_CONFIG_HOME="$HOME/.config"
 fi
 
 # Ensure the existance of pcmanfm config file
 PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
-    mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
+	mkdir -p "$PCMANFM_CONF_DIR"
+	cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file
 OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
 if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then
-    mkdir -p "$OPENBOX_CONF_DIR"
-    cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
+	mkdir -p "$OPENBOX_CONF_DIR"
+	cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
 fi
 
+# Ensure the existance of the 'Desktop' folder
+if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then
+	. "$XDG_CONFIG_HOME/user-dirs.dirs"
+else
+	XDG_DESKTOP_DIR="$HOME/Desktop"
+fi
+mkdir -p "$XDG_DESKTOP_DIR"
+
 # Clean up after GDM (GDM sets the number of desktops to one)
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk
 
+# Launch DBus if needed
+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+	eval "$(dbus-launch --sh-syntax --exit-with-session)"
+fi
+
+export XDG_MENU_PREFIX="lxde-"
+
 # Start the LXDE session
 exec @prefix@/bin/lxsession -s LXDE -e LXDE