diff --git a/debian/changelog b/debian/changelog
index 24a351f..90cd16f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-dev-tools (0.123) UNRELEASED; urgency=low
+
+  * mk-sbuild: Disable daemons with a policy-rc.d script (like pbuilder does)
+
+ -- Stefano Rivera <stefanor@debian.org>  Sun, 24 Apr 2011 12:45:31 +0200
+
 ubuntu-dev-tools (0.122) unstable; urgency=low
 
   [ Ted Gould ]
diff --git a/mk-sbuild b/mk-sbuild
index 1a013b8..35ad22c 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -540,6 +540,21 @@ cat "$TEMP_SCHROOTCONF" | sed \
         | \
         sudo bash -c "cat >> /etc/schroot/schroot.conf"
 rm -f "$TEMP_SCHROOTCONF"
+
+# Disable daemons in chroot:
+sudo bash -c "cat >> $MNT/usr/sbin/policy-rc.d" <<EOM
+#!/bin/sh
+while true; do
+    case "\$1" in
+      -*) shift ;;
+      makedev) exit 0;;
+      x11-common) exit 0;;
+      *) exit 101;;
+    esac
+done
+EOM
+sudo chmod a+x "$MNT"/usr/sbin/policy-rc.d
+
 # Create image finalization script
 sudo bash -c "cat >> $MNT/finish.sh" <<EOM
 #!/bin/bash