diff --git a/debian/changelog b/debian/changelog
index 0a95f5b2..73189acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.153) UNRELEASED; urgency=low
+
+  * we do better not try to create something outside of a chroot while we are
+    in it :P (make sure bootimg's are created in /boot of the chroot and only
+    copied afterwards).
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Sat, 29 Jun 2013 16:59:28 +0200
+
 livecd-rootfs (2.152) saucy; urgency=low
 
   * live-build/auto/build: Fix syntax error.
diff --git a/live-build/auto/build b/live-build/auto/build
index ef879215..9cf3caf3 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -439,7 +439,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
 		initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
 
-		Chroot chroot "abootimg --create "$PREFIX.bootimg-${subarch}" -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
+		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
 	done
 
 	lb chroot_devpts remove "$@"