diff --git a/debian/changelog b/debian/changelog
index 755e93b..5551c2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 lubuntu-default-settings (0.8) UNRELEASED; urgency=low
 
-  * 
+  * debian/control
+   - Depends on the re-written pcmanfm (>= 0.9.5).
+  * usr/share/lubuntu/openbox/menu.xml:
+   - Use new command to launch desktop settings.
+  * autostart: 
+   - Use new pcmanfm --desktop command to start pcmanfm with desktop management
 
  -- Julien Lavergne <gilir@ubuntu.com>  Fri, 21 May 2010 19:32:01 +0200
 
diff --git a/debian/control b/debian/control
index 98a8a42..215205e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Architecture: all
 Depends: ${misc:Depends}, 
          lxsession (>= 0.4.1), 
          lubuntu-artwork (>= 0.4), 
-         elementary-icon-theme
+         elementary-icon-theme,
+         pcmanfm (>= 0.9.5)
 Description: default settings for Lubuntu
  Various system settings tailored for Lubuntu.
diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf
new file mode 100644
index 0000000..68b0941
--- /dev/null
+++ b/etc/xdg/lubuntu/libfm/libfm.conf
@@ -0,0 +1,14 @@
+[config]
+single_click=0
+use_trash=1
+confirm_del=1
+terminal=lxterminal %s
+thumbnail_local=1
+thumbnail_max=2048
+
+[ui]
+big_icon_size=48
+small_icon_size=24
+pane_icon_size=24
+thumbnail_size=128
+show_thumbnail=1
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
index 4fbce44..9bdc5f6 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/autostart
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/autostart
@@ -3,5 +3,5 @@
 @lxpanel --profile Lubuntu
 @xscreensaver -no-splash
 @gnome-power-manager
-@pcmanfm -d
+@pcmanfm --desktop
 @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart
index 7a997cd..ecd7530 100644
--- a/etc/xdg/lxsession/Lubuntu/autostart
+++ b/etc/xdg/lxsession/Lubuntu/autostart
@@ -2,5 +2,5 @@
 @lxpanel --profile Lubuntu
 @xscreensaver -no-splash
 @gnome-power-manager
-@pcmanfm -d
+@pcmanfm --desktop --profile lubuntu
 @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/etc/xdg/pcmanfm/lubuntu.conf b/etc/xdg/pcmanfm/lubuntu.conf
new file mode 100644
index 0000000..6092642
--- /dev/null
+++ b/etc/xdg/pcmanfm/lubuntu.conf
@@ -0,0 +1,20 @@
+[config]
+bm_open_method=0
+su_cmd=gksu %s
+
+[desktop]
+wallpaper_mode=1
+wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+
+[ui]
+always_show_tabs=0
+hide_close_btn=0
+win_width=798
+win_height=547
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=2
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index e353502..72816ed 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/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">
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index c2de821..45b0154 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -361,7 +361,7 @@
 
     <keybind key="XF86MyComputer">
       <action name="Execute">
-          <command>pcmanfm2</command>
+          <command>pcmanfm</command>
       </action>
     </keybind>