diff --git a/debian/changelog b/debian/changelog
index 6092a47..b709903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,12 @@ lubuntu-default-settings (0.16) UNRELEASED; urgency=low
   * usr/share/lubuntu/openbox/rc.xml:
    - Remove some unused code.
   * debian/control
-   - Recommends amixer, scrot and galculator for some openbox keybindings. 
+   - Recommends amixer, scrot and galculator for some openbox keybindings.
+  * etc/xdg/pcmanfm/lubuntu.conf
+   - Move configuration file to etc/xdg/pcmanfm/lubuntu/lubuntu.conf
+  * debian/postrm,preinst,postinst
+   - Handle the location change for pcmanfm configuration using
+     dpkg-maintscript-helper.
 
  -- Julien Lavergne <gilir@ubuntu.com>  Sun, 05 Dec 2010 18:56:49 +0100
 
diff --git a/debian/postinst b/debian/postinst
index b9468af..10d313b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,5 +15,9 @@ if [ "$1" = configure ]; then
     lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 
 fi
 
+if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
+    dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/Lubuntu/lubuntu.conf 0.15 -- "$@"
+fi
+
 #DEBHELPER#
 exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..1253c24
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+set -e
+
+if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
+    dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/Lubuntu/lubuntu.conf 0.15 -- "$@"
+fi
+
+#DEBHELPER#
+exit 0
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..1253c24
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+set -e
+
+if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
+    dpkg-maintscript-helper mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/Lubuntu/lubuntu.conf 0.15 -- "$@"
+fi
+
+#DEBHELPER#
+exit 0
diff --git a/etc/xdg/pcmanfm/lubuntu.conf b/etc/xdg/pcmanfm/lubuntu/lubuntu.conf
similarity index 100%
rename from etc/xdg/pcmanfm/lubuntu.conf
rename to etc/xdg/pcmanfm/lubuntu/lubuntu.conf