diff --git a/debian/changelog b/debian/changelog
index 2535f971..815cb896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.3) oneiric; urgency=low
+
+  * Set pipefail (bash-specific) in auto/build so that we fail immediately
+    if the main image build fails.
+  * Anchor regex to avoid misdetecting vmlinux-3.0-0-powerpc64-smp as a
+    powerpc flavour kernel.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 14 Jun 2011 09:16:43 +0100
+
 livecd-rootfs (2.2) oneiric; urgency=low
 
   * Pass --linux-flavours to lb config if necessary.
diff --git a/live-build/auto/build b/live-build/auto/build
index 19ef2a58..6feb894b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -1,5 +1,6 @@
-#! /bin/sh
+#! /bin/bash
 set -e
+set -o pipefail
 
 export LC_ALL=C
 
@@ -59,7 +60,7 @@ for OUTPUT in ext2 ext3 manifest manifest-remove size squashfs; do
 done
 
 for FLAVOUR in $LB_LINUX_FLAVOURS; do
-	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)/\\1/p" )"
+	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
 		echo "No kernel output for $FLAVOUR!" >&2
 		exit 1