diff --git a/BuildLiveCD b/BuildLiveCD
index 555372e8..2d462fc0 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -84,7 +84,7 @@ esac
 
 for arg in "$@"; do
     case "$arg" in
-	*ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd|ubuntu-headless)	;;
+	*ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd|ubuntu-headless|ubuntu-server)	;;
 	*)
 	    echo "bad project: $arg" >&2
 	    exit 2
diff --git a/debian/changelog b/debian/changelog
index 9e20694b..4a570d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.9) oneiric; urgency=low
+
+  * Rename the ARM headless image to ubuntu-server for oneiric
+  * Future-proof --chroot-filesystem support for a switch to ext4
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 28 Jun 2011 14:20:35 +0100
+
 livecd-rootfs (2.8) oneiric; urgency=low
 
   * Use all_chroot_pyc-purge.sh hook from live-build 3.0~a21-1ubuntu4.
diff --git a/live-build/auto/config b/live-build/auto/config
index a356d98b..447ceb8a 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -49,7 +49,7 @@ COMPONENTS=
 BINARY_REMOVE_LINUX=:
 
 case $IMAGEFORMAT in
-	ext2|ext3)
+	ext2|ext3|ext4)
 		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
 		add_package live jasper
 		;;
@@ -110,7 +110,7 @@ case $PROJECT in
 		add_task install minimal standard
 		;;
 
-	ubuntu-headless)
+	ubuntu-server)
 		add_task install minimal standard
 		;;