diff --git a/debian/changelog b/debian/changelog
index c61b7e8..10f7aad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,11 @@ ubuntu-dev-tools (0.87) UNRELEASED; urgency=low
   [ Luca Falavigna ]
   * Fix some typos in man pages.
 
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Thu, 31 Dec 2009 17:47:10 +0100
+  [ Kees Cook ]
+  * mk-sbuild-lv: drop deprecated sbuild configuration fields from template.
+  * what-patch: updated for 3.0 source format.
+
+ -- Kees Cook <kees@ubuntu.com>  Tue, 05 Jan 2010 08:14:11 -0800
 
 ubuntu-dev-tools (0.86) lucid; urgency=low
 
diff --git a/mk-sbuild-lv b/mk-sbuild-lv
index 99cf503..5d5e4fd 100755
--- a/mk-sbuild-lv
+++ b/mk-sbuild-lv
@@ -356,13 +356,9 @@ description=CHROOT_NAME
 priority=3
 groups=sbuild,root,admin
 root-groups=root,sbuild,admin
-source-groups=sbuild,root,admin
-source-root-groups=root,sbuild,admin
 device=CHROOT_PATH
 mount-options=-o noatime
 lvm-snapshot-options=--size SNAPSHOT_SIZE
-run-setup-scripts=true
-run-exec-scripts=true
 EOM
 fi
 if [ ! -z "$personality" ]; then
diff --git a/what-patch b/what-patch
index c7bcd54..d77aecf 100755
--- a/what-patch
+++ b/what-patch
@@ -66,6 +66,11 @@ if [ "$VERBOSE" -gt 0 ]; then
 	fi
 fi
 
+if fgrep -q quilt debian/source/format 2>/dev/null; then
+	echo "quilt"
+	exit 0
+fi
+
 # Do not change the output of existing checks by default, as there are build
 # tools that rely on the exisitng output.  If changes in reporting is needed,
 # please check the "VERBOSE" flag (see below for examples).  Feel free