diff --git a/debian/changelog b/debian/changelog
index b52cc78..bee60c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
 lubuntu-default-settings (0.24) UNRELEASED; urgency=low
 
+  [ Julien Lavergne ]
   * usr/share/lubuntu/openbox/rc.xml
    - Remove workaround for lxpanel run dialog, now it's fixed in lxpanel.
    - Revert maximised windows by default, need more integration (LP: #926788)
 
+  [ Colin Watson ]
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
+    new enough version of dpkg rather than using 'dpkg-maintscript-helper
+    supports' guards, leading to more predictable behaviour on upgrades.
+    (LP: #932209)
+
  -- Julien Lavergne <gilir@ubuntu.com>  Sat, 18 Feb 2012 12:07:22 +0100
 
 lubuntu-default-settings (0.23) precise; urgency=low
diff --git a/debian/control b/debian/control
index 6ce12e3..fdbd1d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: lubuntu-default-settings
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~), 
+Build-Depends: debhelper (>= 8.1.0~),
                intltool
 Standards-Version: 3.8.3
 Homepage: https://launchpad.net/~lubuntu-desktop
@@ -11,6 +11,7 @@ Vcs-Browser: http://bazaar.launchpad.net/~lubuntu-desktop/+junk/lubuntu-default-
 
 Package: lubuntu-default-settings
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, 
          lxsession (>= 0.4.1), 
          lubuntu-artwork (>= 0.4), 
diff --git a/debian/postinst b/debian/postinst
index b992716..f965f17 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -10,10 +10,6 @@ if [ -f /etc/alternatives/lxdm.conf ] ; then
   fi
 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/pcmanfm.conf 0.15 -- "$@"
-fi
-
 if [ "$1" = "configure" ] ; then
   update-alternatives --install /etc/lxdm/default.conf \
     lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 
diff --git a/debian/postrm b/debian/postrm
index 8623a9c..ccae28d 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,10 +2,6 @@
 
 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/pcmanfm.conf 0.15 -- "$@"
-fi
-
 case "$1" in
   remove|purge)
     if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100644
index 390e22c..0000000
--- a/debian/preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/pcmanfm.conf 0.15 -- "$@"
-fi
-
-#DEBHELPER#
-exit 0