diff --git a/debian/changelog b/debian/changelog
index ee6b612d..db777a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.26) UNRELEASED; urgency=low
+
+  * make sure flash-kernel is not executed during build, this setting wasn't
+    transitioned from livecd.sh yet
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 18 Aug 2011 11:51:54 +0200
+
 livecd-rootfs (2.25) oneiric; urgency=low
 
   * include the md5 sum of the rootfs tarball in the initrd, so the installer
diff --git a/live-build/auto/config b/live-build/auto/config
index e1c80a69..9dc63310 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -185,6 +185,7 @@ esac
 case $ARCH in
 	armel)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
+		FLASH_KERNEL_SKIP=1
 		case $SUBARCH in
 			dove)
 				BINARY_REMOVE_LINUX=false