diff --git a/BuildLiveCD b/BuildLiveCD
index 531ac0f0..555372e8 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -36,7 +36,7 @@ LIVE_BUILD=false
 while getopts :s:d:f:pa:l name; do case $name in
     s)	SUBARCH="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
-    f)	IMAGEFORMAT="-f$OPTARG";;
+    f)	IMAGEFORMAT="$OPTARG";;
     p)	PROPOSED="-p";;
     a)	APT_SOURCE="-A $OPTARG";;
     l)	LIVE_BUILD=:;;
@@ -143,7 +143,7 @@ for STE in $SUITES; do
 	fi
 	COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
     else
-	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
+	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi
     if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then
 	rm -f ${PUBDIR}current
diff --git a/debian/changelog b/debian/changelog
index ed1cfa9e..d0546bf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.5) oneiric; urgency=low
+
+  * Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.
+  * Add Lubuntu support.
+  * Set --chroot-filesystem option if IMAGEFORMAT is ext2 or ext3.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 15 Jun 2011 14:40:05 +0100
+
 livecd-rootfs (2.4) oneiric; urgency=low
 
   * Remove old config directory before creating a new configuration.
diff --git a/live-build/auto/config b/live-build/auto/config
index 82c02459..6a3d3151 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -50,7 +50,7 @@ BINARY_REMOVE_LINUX=:
 
 case $IMAGEFORMAT in
 	ext2|ext3)
-		OPTS="${OPTS:+$OPTS }--initramfs none"
+		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
 		add_package live jasper
 		;;
 
@@ -100,6 +100,12 @@ case $PROJECT in
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
+	lubuntu)
+		add_task install minimal standard lubuntu-desktop
+		add_task live lubuntu-live
+		COMPONENTS='main restricted universe multiverse'
+		;;
+
 	base)
 		add_task install minimal standard
 		;;