diff --git a/BuildLiveCD b/BuildLiveCD
index d84e6ec1..531ac0f0 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -130,16 +130,13 @@ for STE in $SUITES; do
     fi
     NOW=${NOW}
     LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
-    > ${LOG}
 
     rm -f ${PUBDIR}latest
     ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest
     mkdir -p ${PUBDIR}${NOW}
+    > ${LOG}
     if $LIVE_BUILD; then
-	mkdir -p "${DIR}/auto"
-	for f in config build clean; do
-	    ln -s "/usr/share/livecd-rootfs/live-build/auto/$f" "${DIR}/auto/"
-	done
+	$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && rm -rf auto && mkdir -p auto && for f in config build clean; do ln -s /usr/share/livecd-rootfs/live-build/auto/\$f auto/; done" >> ${LOG} 2>&1 || true
 	$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && lb clean --purge" >> ${LOG} 2>&1 || true
 	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} lb config" >> ${LOG} 2>&1; then
 	    exit 1
diff --git a/debian/changelog b/debian/changelog
index e02d0187..8e96334c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.1) oneiric; urgency=low
+
+  * Fix ordering of log file creation in BuildLiveCD.
+  * Fix permissions in BuildLiveCD when setting up auto directory.
+  * Switch from --binary-remove-linux to config/binary_rootfs/excludes.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 13 Jun 2011 23:32:40 +0100
+
 livecd-rootfs (2.0) oneiric; urgency=low
 
   * Add live-build support.  The old livecd.sh is still here for
diff --git a/debian/control b/debian/control
index 25f29db7..e12c60d6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: all
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, live-build (>= 3.0~a20-1ubuntu1)
+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, live-build (>= 3.0~a21-1ubuntu1)
 Suggests: partimage
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem
diff --git a/live-build/auto/config b/live-build/auto/config
index aea794ef..5c82cd0a 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -44,7 +44,7 @@ add_package ()
 
 OPTS=
 COMPONENTS=
-BINARY_REMOVE_LINUX=true
+BINARY_REMOVE_LINUX=:
 
 case $IMAGEFORMAT in
 	ext2|ext3)
@@ -141,7 +141,6 @@ lb config noauto \
 	--distribution "$SUITE" \
 	--bootstrap-keyring ubuntu-keyring \
 	--binary-images none \
-	--binary-remove-linux "$BINARY_REMOVE_LINUX" \
 	--memtest none \
 	--source false \
 	--build-with-chroot false \
@@ -153,6 +152,13 @@ lb config noauto \
 	--initramfs-compression lzma \
 	$OPTS
 
+if $BINARY_REMOVE_LINUX; then
+	cat > config/binary_rootfs/excludes << EOF
+boot/vmlinu?-*
+boot/initrd.img-*
+EOF
+fi
+
 case $PROJECT in
 	kubuntu|kubuntu-mobile)
 		ln -s /usr/share/live/build/examples/hooks/kubuntu_chroot_icon-theme.sh config/chroot_local-hooks/