diff --git a/debian/changelog b/debian/changelog
index 6dda28c8..0f2e20b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.143) UNRELEASED; urgency=low
+
+  * drop all the cleanup code, we already have the tarball and don't need to
+    clean the chroot.
+  * add better quoting for update-initramfs and abootimg calls for
+    ubuntu-touch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 21:47:03 +0200
+
 livecd-rootfs (2.142) saucy; urgency=low
 
   * copy the initrd out of the chroot before we purge the kernel package on
diff --git a/live-build/auto/build b/live-build/auto/build
index a1ca0f8f..9f43f6e2 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -430,10 +430,10 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		Chroot chroot "apt-get -y install $kpkg"
 
 		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
-		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -c -v"
-		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
+		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k ${kver} -c -v"
+		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
 
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}.bootimg"
 
 		Chroot chroot "apt-get -y purge $kpkg"
 	done
@@ -441,22 +441,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	lb chroot_devpts remove "$@"
 	lb chroot_sysfs remove "$@"
 	lb chroot_proc remove "$@"
-
-	rm -rf chroot/var/lib/initramfs-tools/*
-	Chroot chroot "apt-get -y purge crda wireless-regdb"
-	Chroot chroot "apt-get -y clean"
-
-	mv "${sourceslist}.orig" "${sourceslist}"
-	mv "${sourceslist}.d.orig" "${sourceslist}.d"
-	for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
-		rm $file
-	done
-	if [ -e chroot/etc/resolv.conf.orig ]; then
-		mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
-	else
-		rm chroot/etc/resolv.conf
-	fi
-	rm -rf chroot/boot/* || true
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))