diff --git a/usr/share/lubuntu/pcmanfm/pcmanfm.conf b/etc/xdg/lubuntu/pcmanfm/lubuntu.conf
similarity index 100%
rename from usr/share/lubuntu/pcmanfm/pcmanfm.conf
rename to etc/xdg/lubuntu/pcmanfm/lubuntu.conf
diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart
index 2cbc956..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 --desktop
+@pcmanfm --desktop --profile lubuntu
 @/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu
index 9faa5ae..410a8a9 100644
--- a/usr/bin/startlubuntu
+++ b/usr/bin/startlubuntu
@@ -31,7 +31,7 @@ fi
 
 if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
     mkdir -p "$PCMANFM_CONF_DIR"
-    cp /usr/share/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
+    cp /etc/xdg/lubuntu/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of pcmanfm config file