diff --git a/debian/changelog b/debian/changelog
index 20cefa20..96e8babf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.25) UNRELEASED; urgency=low
+
+  * include the md5 sum of the rootfs tarball in the initrd, so the installer
+    can check against it for ac100 installs
+  * post process the kernel and initrd for ac100 though abootimg to get a
+    proper android boot image
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 17 Aug 2011 17:45:08 +0200
+
 livecd-rootfs (2.24) oneiric; urgency=low
 
   * add missing ;; to the mx5 case statement
diff --git a/live-build/auto/build b/live-build/auto/build
index 2a579c9d..ad49d20d 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -164,6 +164,29 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
 fi
 
+if [ "$SUBARCH" = "ac100" ]; then
+	# create the md5sum file for which we are actually doing all this
+	md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
+
+	# make sure update-initramfs feels cosy and warm in the environment
+	lb chroot_proc install "$@"
+	lb chroot_sysfs install "$@"
+	lb chroot_devpts install "$@"
+
+	# re-create initrd to contain the installer.md5 file
+	Chroot chroot "update-initramfs -k all -t -u -v"
+
+	# create boot.img
+	Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinu?-${KVERS}"
+
+	# clean up
+	lb chroot_devpts remove "$@"
+	lb chroot_sysfs remove "$@"
+	lb chroot_proc remove "$@"
+
+	cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.installer-$FLAVOUR.img"
+fi
+
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
 case $PROJECT in
 	edubuntu-dvd)