diff --git a/BuildLiveCD b/BuildLiveCD
index 08cac9bd..31040267 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -112,6 +112,7 @@ for STE in $SUITES; do
     if [ -d ~/build-${STE}-live/chroot-${STE} ]; then
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -qq update || true
 	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y dist-upgrade || true
+	sudo chroot ~/build-${STE}-live/chroot-${STE} apt-get -y install livecd-rootfs || true
     fi
 done
 for STE in $SUITES; do
diff --git a/debian/changelog b/debian/changelog
index 9972a491..517cc127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.22) oneiric; urgency=low
+
+  [ Adam Conrad ]
+  * Switch a hardcoded "boot" to "$INITFS" in auto/build.
+
+  [ Colin Watson ]
+  * BuildLiveCD: Make sure livecd-rootfs is still installed in the chroot
+    after the dist-upgrade.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 11 Aug 2011 12:19:58 +0100
+
 livecd-rootfs (2.21) oneiric; urgency=low
 
   * make sure ac100 images have universe enabled since the kernel lives there.
diff --git a/live-build/auto/build b/live-build/auto/build
index ff927926..2a579c9d 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -129,7 +129,7 @@ if [ -e "binary/$INITFS/filesystem.packages" ]; then
 fi
 if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
 	# Not a typo, empty manifest-remove has a single LF in it. :/
-	if [ $(cat binary/boot/filesystem.packages-remove | wc -c) -gt 1 ]; then
+	if [ $(cat binary/$INITFS/filesystem.packages-remove | wc -c) -gt 1 ]; then
 		ln "binary/$INITFS/filesystem.packages-remove" "$PREFIX.manifest-remove"
 		chmod 644 "$PREFIX.manifest-remove"
 	fi