diff -Nru live-build-3.0~a24/debian/changelog live-build-3.0~a24/debian/changelog
--- live-build-3.0~a24/debian/changelog	2012-01-27 03:15:55.000000000 +0000
+++ live-build-3.0~a24/debian/changelog	2012-02-22 00:12:26.000000000 +0000
@@ -1,3 +1,13 @@
+live-build (3.0~a24-1ubuntu23) precise; urgency=low
+
+  * ubuntu-resolvconf.patch: If chroot/etc/resolvconf/resolv.conf.d
+    exists, tidy up the original and tail files, which are artifacts
+    of the build (and leak the host system's resolv.conf)
+  * ubuntu-chroot_hacks-clean-tmpdirs.patch: Clean out more cruft
+    in chroot/run, chroot/tmp, chroot/var/run, and chroot/var/tmp
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 21 Feb 2012 16:33:43 -0700
+
 live-build (3.0~a24-1ubuntu22) precise; urgency=low
 
   * Add ubuntu-resolvconf.patch: If /etc/resolv.conf is a dangling symlink,
diff -Nru live-build-3.0~a24/debian/patches/series live-build-3.0~a24/debian/patches/series
--- live-build-3.0~a24/debian/patches/series	2012-01-27 01:20:21.000000000 +0000
+++ live-build-3.0~a24/debian/patches/series	2012-02-22 00:08:32.000000000 +0000
@@ -17,3 +17,4 @@
 ubuntu-i386-generic-pae.patch
 ubuntu-timestamp.patch
 ubuntu-resolvconf.patch
+ubuntu-chroot_hacks-clean-tmpdirs.patch
diff -Nru live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch
--- live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch	1970-01-01 00:00:00.000000000 +0000
+++ live-build-3.0~a24/debian/patches/ubuntu-chroot_hacks-clean-tmpdirs.patch	2012-02-22 00:14:04.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Clean up chroot/tmp chroot/run chroot/var/tmp chroot/var/run
+Author: Adam Conrad <adconrad@ubuntu.com>
+
+--- live-build-3.0~a24.orig/scripts/build/lb_chroot_hacks
++++ live-build-3.0~a24/scripts/build/lb_chroot_hacks
+@@ -248,6 +248,11 @@ rm -f chroot/var/cache/debconf/*-old
+ rm -f chroot/var/lib/dpkg/*-old
+ rm -f chroot/var/lib/dbus/machine-id
+ rm -f chroot/var/log/apt/term.log
++# Some of these are sometimes symlinks, but it never hurts to be thorough
++rm -rf chroot/run/*
++rm -rf chroot/tmp/*
++rm -rf chroot/var/run/*
++rm -rf chroot/var/tmp/*
+ 
+ if [ -n "${LB_ROOT_COMMAND}" ]
+ then
diff -Nru live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch
--- live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch	2012-01-27 01:21:27.000000000 +0000
+++ live-build-3.0~a24/debian/patches/ubuntu-resolvconf.patch	2012-02-21 23:39:39.000000000 +0000
@@ -1,5 +1,5 @@
 Description: Deal with the case where /etc/resolv.conf is a symlink
-Author: Stéphane Graber <stgraber@ubuntu.com>
+Author: Stéphane Graber <stgraber@ubuntu.com>, Adam Conrad <adconrad@ubuntu.com>
 Last-Update: 2012-01-26
 
 --- live-build-3.0~a24.orig/scripts/build/lb_chroot_resolv
@@ -24,3 +24,16 @@
  		then
  			# Restoring resolv file or symlink
  			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
+@@ -85,6 +89,12 @@
+ 			# Truncating resolv file
+ 			Truncate chroot/etc/resolv.conf
+ 		fi
++
++		# Clean up resolvconf's pollution
++		if [ -d chroot/etc/resolvconf/resolv.conf.d ]; then
++			rm -f chroot/etc/resolvconf/resolv.conf.d/original
++			rm -f chroot/etc/resolvconf/resolv.conf.d/tail
++		fi
+ 
+ 		# Removing stage file
+ 		rm -f .stage/chroot_resolv