diff --git a/debian/changelog b/debian/changelog
index 69de1dca..9a0cefb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ livecd-rootfs (0.29) UNRELEASED; urgency=low
   * Update kernels for i386 and amd64 to reflect recent renaming.
   * Remove all cloop-related code, we're not squashfs-only on all arches.
   * Add mirror information to make things work faster on my network.
+  * Swap out more metapackages for tasks (ubuntu-minimal/ubuntu-standard)
 
  -- Adam Conrad <adconrad@ubuntu.com>  Thu, 21 Sep 2006 10:37:09 +1000
 
diff --git a/livecd.sh b/livecd.sh
index cc47ec80..c22e8f80 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -126,27 +126,27 @@ Flags: seen
 
     case "$FS" in
 	ubuntu)
-	    LIST="$LIST ubuntu-minimal ubuntu-standard^ ubuntu-desktop^"
+	    LIST="$LIST minimal^ standard^ ubuntu-desktop^"
 	    LIVELIST="ubuntu-live^ xresprobe laptop-detect casper"
 	    ;;
 	kubuntu)
-	    LIST="$LIST ubuntu-minimal ubuntu-standard^ kubuntu-desktop^"
+	    LIST="$LIST minimal^ standard^ kubuntu-desktop^"
 	    LIVELIST="kubuntu-live^ xresprobe laptop-detect casper"
 	    ;;
 	edubuntu)
-	    LIST="$LIST ubuntu-minimal ubuntu-standard^ edubuntu-desktop^"
+	    LIST="$LIST minimal^ standard^ edubuntu-desktop^"
 	    LIVELIST="edubuntu-live^ xresprobe laptop-detect casper"
 	    ;;
 	xubuntu)
-	    LIST="$LIST ubuntu-minimal ubuntu-standard^ xterm libgoffice-gtk-0-3 xubuntu-desktop^"
+	    LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-3 xubuntu-desktop^"
 	    LIVELIST="xubuntu-live^ xresprobe laptop-detect casper"
 	    ;;
 	base)
-	    LIST="$LIST ubuntu-minimal ubuntu-standard^"
+	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="casper"
 	    ;;
 	tocd)
-	    LIST="$LIST ubuntu-minimal ubuntu-standard^"
+	    LIST="$LIST minimal^ standard^"
 	    tocdtmp=`mktemp -d` || exit 1
 	    tocdgerminate='http://people.ubuntu.com/~cjwatson/germinate-output/tocd3.1-dapper/'
 	    if wget -O "$tocdtmp"/desktop "$tocdgerminate"/desktop; then