diff --git a/debian/changelog b/debian/changelog
index 2eb6179..d96bbb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ubuntu-dev-tools (0.123) UNRELEASED; urgency=low
     - Reformat manpage.
     - Install qemu-user-static instead of qemu-kvm-extras-static.
     - Correctly substitute release into security suite name.
+    - Put schroot configuration in chroot.d/sbuild-$chroot (LP: #736808)
 
  -- Stefano Rivera <stefanor@debian.org>  Sun, 24 Apr 2011 12:45:31 +0200
 
diff --git a/mk-sbuild b/mk-sbuild
index f149e5e..362491b 100755
--- a/mk-sbuild
+++ b/mk-sbuild
@@ -551,14 +551,13 @@ fi
 if [ ! -z "$SCHROOT_CONF_SUFFIX" ]; then
     echo "$SCHROOT_CONF_SUFFIX" >> "$TEMP_SCHROOTCONF"
 fi
-cat "$TEMP_SCHROOTCONF" | sed \
-        -e "s|CHROOT_NAME|$CHROOT_NAME|g" \
-        -e "s|CHROOT_PATH|$CHROOT_PATH|g" \
-        -e "s|SNAPSHOT_SIZE|$SNAPSHOT_SIZE|g" \
-        -e "s|SCHROOT_TYPE|$SCHROOT_TYPE|g" \
-        -e "s|CHROOT_SNAPSHOT_DIR|$CHROOT_SNAPSHOT_DIR|g" \
-        | \
-        sudo bash -c "cat >> /etc/schroot/schroot.conf"
+sed -e "s|CHROOT_NAME|$CHROOT_NAME|g" \
+    -e "s|CHROOT_PATH|$CHROOT_PATH|g" \
+    -e "s|SNAPSHOT_SIZE|$SNAPSHOT_SIZE|g" \
+    -e "s|SCHROOT_TYPE|$SCHROOT_TYPE|g" \
+    -e "s|CHROOT_SNAPSHOT_DIR|$CHROOT_SNAPSHOT_DIR|g" \
+    "$TEMP_SCHROOTCONF" \
+    | sudo tee "/etc/schroot/chroot.d/sbuild-$CHROOT_NAME" > /dev/null
 rm -f "$TEMP_SCHROOTCONF"
 
 # Disable daemons in chroot: