diff --git a/debian/changelog b/debian/changelog
index e454e938..e98cb4c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.122) UNRELEASED; urgency=low
+
+  * livecd.sh don't set a variable to itself, especially when the variable
+    is empty and causes build failures under set -u.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 25 Jun 2010 21:57:56 -0700
+
 livecd-rootfs (1.121) maverick; urgency=low
 
   [ LaMont Jones ]
diff --git a/livecd.sh b/livecd.sh
index 4219fdc0..801c6627 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -180,8 +180,6 @@ fi
 
 if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
        LIVE_BOOT_SCRIPTS="jasper"
-else
-       LIVE_BOOT_SCRIPTS="$LIVE_BOOT_SCRIPTS"
 fi
 
 for arg in "$@"; do