diff --git a/debian/changelog b/debian/changelog
index d38882ca..817992b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.141) UNRELEASED; urgency=low
+
+  * make removal of non existing old initrds non fatal in ubuntu-touch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 16:25:18 +0200
+
 livecd-rootfs (2.140) saucy; urgency=low
 
   *  hardcode dist in the temporary sources.list of the ubuntu-touch initrd
diff --git a/live-build/auto/build b/live-build/auto/build
index 033c0bdb..fdb2b908 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -435,8 +435,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 		Chroot chroot "apt-get -y purge $kpkg"
 
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
-		rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
 	done
 
 	lb chroot_devpts remove "$@"
@@ -457,6 +456,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	else
 		rm chroot/etc/resolv.conf
 	fi
+	rm -rf chroot/boot/* || true
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))