diff --git a/debian/changelog b/debian/changelog
index b6331fb..75093d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ nut (2.6.4-3) UNRELEASED; urgency=low
   * Move nut metapackage to Section: metapackages
   * Also create nut user when installing nut-client package and do not delete
     it on purge anymore (Closes: #682000)
+  * Drop /etc/default/nut → /etc/nut/nut.conf migration code, migration
+    happends before squeeze release (Closes: #684392)
 
- -- Laurent Bigonville <bigon@debian.org>  Thu, 09 Aug 2012 21:18:03 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Thu, 09 Aug 2012 21:32:09 +0200
 
 nut (2.6.4-2) unstable; urgency=low
 
diff --git a/debian/nut-server.postinst b/debian/nut-server.postinst
index 193676f..c2574b8 100644
--- a/debian/nut-server.postinst
+++ b/debian/nut-server.postinst
@@ -49,69 +49,6 @@ case "$1" in
       && udevadm trigger --subsystem-match=usb --action=change
 
     # 557178  udevadm trigger --subsystem-match=usb
-
-    # migrate /etc/default/nut to /etc/nut/nut.conf (part #2)
-    if dpkg --compare-versions "$2" lt-nl "2.4.1-2" ; then
-      # source the temporary /etc/default/nut.bak file
-      if [ -f /etc/default/nut.bak ] ; then
-        . /etc/default/nut.bak
-
-        # FIXME: use a template (and debconf to output?)
-        echo "migrating /etc/default/nut to /etc/nut/nut.conf"
-
-        # pre process the config
-        case "$START_UPSD" in
-          y|Y|yes|YES|Yes)
-            START_UPSD=yes
-            ;;
-          *)
-            START_UPSD=no
-            ;;
-        esac
-        case "$START_UPSMON" in
-          y|Y|yes|YES|Yes)
-            START_UPSMON=yes
-            ;;
-          *)
-            START_UPSMON=no
-            ;;
-        esac
-
-        # now process the result
-        if [ "x$START_UPSD" = "xyes" ] ; then
-          if [ "x$START_UPSMON" = "xyes" ] ; then
-            # can also be netserver
-            NUT_MODE=standalone
-          #else not processed since it should be an error!
-          fi
-        else
-          if [ "x$START_UPSMON" = "xyes" ] ; then
-            NUT_MODE=netclient
-          else
-            NUT_MODE=none
-          fi
-        fi
-
-        # output back the MODE to nut.conf
-        sed "s/^MODE\(.*\)/MODE=$NUT_MODE/" /etc/nut/nut.conf  > /etc/nut/nut.conf.new
-
-        # append the content of default, removing START_* / start...
-        grep -iv 'START' /etc/default/nut.bak >> /etc/nut/nut.conf.new
-        # move back to nut.conf
-        mv /etc/nut/nut.conf.new /etc/nut/nut.conf
-        # and to init.d/nut
-        #if [ -f /etc/init.d/nut ] ; then
-        #  sed "s/^UPSD_OPTIONS\(.*\)/UPSD_OPTIONS=\"$UPSD_OPTIONS\"/" /etc/init.d/nut  > /etc/init.d/nut.new
-        #  sed "s/^UPSMON_OPTIONS\(.*\)/UPSMON_OPTIONS=\"$UPSMON_OPTIONS\"/" /etc/init.d/nut.new  > /etc/init.d/nut
-        #fi
-        rm -f /etc/default/nut.bak /etc/default/nut
-      fi
-    else
-      # re process nut.conf MODE so that it can be sourced
-      NUT_MODE=`grep -e '^ *MODE' /etc/nut/nut.conf | tr -d " "`
-      sed "s/^ *MODE.*/$NUT_MODE/" /etc/nut/nut.conf > /etc/nut/nut.conf.new
-      mv /etc/nut/nut.conf.new /etc/nut/nut.conf
-    fi
     ;;
 
   abort-upgrade)
diff --git a/debian/nut-server.preinst b/debian/nut-server.preinst
index 587c150..72370d5 100644
--- a/debian/nut-server.preinst
+++ b/debian/nut-server.preinst
@@ -5,13 +5,6 @@ if [ "$1" = upgrade ]; then
 	[ -f /etc/udev/rules.d/025_nut-usbups.rules ] && rm -f /etc/udev/rules.d/025_nut-usbups.rules
 	[ -f /etc/udev/rules.d/52_nut-usbups.rules ] && rm -f /etc/udev/rules.d/52_nut-usbups.rules
 	[ -f /etc/udev/rules.d/52-nut-usbups.rules ] && rm -f /etc/udev/rules.d/52-nut-usbups.rules
-
-	# migrate /etc/default/nut to /etc/nut/nut.conf (part #1)
-	# we need to do this before default gets trashed
-	if [ -f /etc/default/nut ] ; then
-		# backup /etc/default/nut
-		cp /etc/default/nut /etc/default/nut.bak
-	fi
 fi
 
 #DEBHELPER#