diff --git a/debian/changelog b/debian/changelog
index 2535f971..ee24332e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.3) UNRELEASED; urgency=low
+
+  * Set pipefail (bash-specific) in auto/build so that we fail immediately
+    if the main image build fails.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 14 Jun 2011 08:58:02 +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..c597f377 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