diff --git a/debian/changelog b/debian/changelog
index 5dd04de7..087ba467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.7) UNRELEASED; urgency=low
+
+  * Install xubuntu-live for xubuntu, not edubuntu-live (LP: #800211).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 21 Jun 2011 17:40:07 +0100
+
 livecd-rootfs (2.6) oneiric; urgency=low
 
   * '--initramfs none' produces *.packages* outputs rather than *.manifest*;
diff --git a/live-build/auto/config b/live-build/auto/config
index 6a3d3151..db93e71d 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -85,7 +85,7 @@ case $PROJECT in
 	xubuntu)
 		add_task install minimal standard xubuntu-desktop
 		add_package install xterm
-		add_task live edubuntu-live
+		add_task live xubuntu-live
 		COMPONENTS='main restricted universe multiverse'
 		;;