diff -u makedev-2.3.1/debian/changelog makedev-2.3.1/debian/changelog
--- makedev-2.3.1/debian/changelog
+++ makedev-2.3.1/debian/changelog
@@ -1,3 +1,28 @@
+makedev (2.3.1-93ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Remove the udev handling; we actually deliberately invoke MAKEDEV on
+      udev-managed directories to make the basic devices now.
+  * Dropped changes, included in Debian:
+    - Mark makedev as Multi-Arch: foreign to allow for mountall
+      to be installable with multi-arch (needed for armhf containers on x86)
+    - debian/preinst: don't call update-rc.d remove on initial installation
+      of the package.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 18 May 2013 22:55:45 -0700
+
+makedev (2.3.1-93) unstable; urgency=low
+
+  * QA upload.
+  * Mark makedev as Multi-Arch: foreign to allow for mountall to be
+    installable with multi-arch (needed for armhf containers on x86; thanks,
+    Stéphane Graber).
+  * Remove preinst script, which had a buggy version comparison and in any
+    case only applied to upgrades from lenny (thanks, Steve Langasek;
+    closes: #674218).
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 09 May 2013 12:00:49 +0100
+
 makedev (2.3.1-92ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable, remaining changes:
reverted:
--- makedev-2.3.1/debian/preinst
+++ makedev-2.3.1.orig/debian/preinst
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-
-# Remove a no-longer used conffile
-rm_conffile() {
-    PKGNAME="$1"
-    CONFFILE="$2"
-    if [ -e "$CONFFILE" ]; then
-        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
-        if [ "$md5sum" != "$old_md5sum" ]; then
-            echo "Obsolete conffile $CONFFILE has been modified by you."
-            echo "Saving as $CONFFILE.dpkg-old ..."
-            mv -f "$CONFFILE" "$CONFFILE".dpkg-old
-        else
-            echo "Removing obsolete conffile $CONFFILE ..."
-            rm -f "$CONFFILE"
-        fi
-    fi
-}
-
-case "$1" in
-install|upgrade)
-    if dpkg --compare-versions "$2" le-nl "2.3.1-87"; then
-	rm_conffile makedev /etc/init.d/makedev
-	update-rc.d makedev remove
-    fi
-esac
-
-rm -f /usr/man/man8/MAKEDEV.8 /usr/man/man8/MAKEDEV-C.8 \
-	/usr/man/man8/MAKEDEV-C.8.gz
-
-#DEBHELPER#
-
-exit 0