diff --git a/BuildLiveCD b/BuildLiveCD
index 508e56a6..fe4aed11 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -97,7 +97,8 @@ fi
 FS="$1"
 shift
 
-lockfile ~/buildLiveCD.lock || exit 1
+# 12 hours should be enough for even the longest build queue to clear.
+lockfile -8 -r$((12 * 60 * 60 / 8)) ~/buildLiveCD.lock || exit 1
 trap "finish" 0
 trap "rm -f ~/buildLiveCD.lock; exit 1" 1 2 3 15
 exec > $BUILD_LOG 2>&1
diff --git a/debian/changelog b/debian/changelog
index 0a86162b..7db25f7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (2.135) saucy; urgency=low
+
+  [ Colin Watson ]
+  * BuildLiveCD: Time out lockfile after 12 hours, which should be enough
+    for even the longest build queue to clear.
+
+  [ Oliver Grawert ]
+  * add live-build script for subarch specific Ubuntu Touch initrd
+    and boot image creation
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 27 May 2013 14:34:17 +0200
+
 livecd-rootfs (2.134) saucy; urgency=low
 
   * remove qt5-proper PPA from ubuntu touch builds
diff --git a/live-build/auto/build b/live-build/auto/build
index c6a068ba..ef730b2d 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -403,6 +403,33 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 
 fi
 
+if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
+	for subarch in maguro manta grouper mako; do
+
+		lb chroot_proc install "$@"
+		lb chroot_sysfs install "$@"
+		lb chroot_devpts install "$@"
+
+		kpkg="$(apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/  Depends: //')"
+		kver=${kpkg#linux-image-}
+		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 -t -u -v"
+		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
+
+		Chroot chroot "apt-get -y purge $kpkg"
+
+		lb chroot_devpts remove "$@"
+		lb chroot_sysfs remove "$@"
+		lb chroot_proc remove "$@"
+
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
+		rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
+	done
+	Chroot chroot "apt-get -y purge crda wireless-regdb"
+fi
+
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
 case $PROJECT in
 	edubuntu-dvd)