diff --git a/BuildLiveCD b/BuildLiveCD
index 62570762..6021321a 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -31,6 +31,7 @@ DEFAULTSUITE="karmic"
 NEWSUITE=""
 SUITES=""
 PROPOSED=""
+IMAGEFORMAT=""
 if [ "$1" = '-s' ]; then
     shift
     SUBARCH="$1"
@@ -48,6 +49,11 @@ if [ "$1" = '-d' ]; then
 else
     NEWSUITE="$DEFAULTSUITE"
 fi
+if [ "$1" = '-f' ]; then
+    shift
+    IMAGEFORMAT=$1
+    shift
+fi
 for s in $NEWSUITE; do
     if [ -d build-${s}-live/chroot-${s} ]; then SUITES="$SUITES $s"; fi
 done
@@ -128,7 +134,7 @@ for STE in $SUITES; do
 	rm -f ${PUBDIR}latest
 	ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest
 	mkdir -p ${PUBDIR}${NOW}
-	if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${ARCHARG} $arg" > ${LOG} 2>&1; then
+	if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && /usr/sbin/livecd.sh ${SUBARCHARG} ${PROPOSED} -d${STE} ${ARCHARG} ${IMAGEFORMAT} $arg" > ${LOG} 2>&1; then
 	    rm -f ${PUBDIR}current
 	    ln -sf ${NOW} ${PUBDIR}current
 
diff --git a/debian/changelog b/debian/changelog
index 256a2a75..b8cb0aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ livecd-rootfs (1.116) UNRELEASED; urgency=low
   * added new -f switch for changing image build type
   * added support for building ext2 and ext3 images in addition to squashfs
   * fixed spacing in the livefs build code
+  * extended BuildLiveCD to handle the -f switch
 
  -- Michael Casadevall <mcasadevall@ubuntu.com>  Mon, 17 May 2010 13:59:28 -0400