diff --git a/debian/changelog b/debian/changelog
index 59741d22..b2d9d3b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ livecd-rootfs (2.31) UNRELEASED; urgency=low
 
   * Link binary.iso or binary-hybrid.iso, if found, into the output
     directory for use by BuildLiveCD.
+  * Tolerate ubuntu-defaults-image's kernel renaming.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 23 Aug 2011 18:28:02 +0100
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 216493bc..512ea791 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -148,6 +148,10 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	fi
 	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
+		if [ -e "binary/$INITFS/vmlinuz" ]; then
+			# already renamed by ubuntu-defaults-image
+			break
+		fi
 		echo "No kernel output for $FLAVOUR!" >&2
 		exit 1
 	fi
@@ -167,8 +171,16 @@ done
 NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
 if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	# only one kernel flavour
-	ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
-	ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
+	if [ -e "binary/$INITFS/vmlinuz" ]; then
+		ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
+	else
+		ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
+	fi
+	if [ -e "binary/$INITFS/initrd.lz" ]; then
+		ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
+	else
+		ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
+	fi
 fi
 
 if [ "$SUBARCH" = "ac100" ]; then