diff --git a/debian/changelog b/debian/changelog
index e125727e..e8b5bc22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.65.7) UNRELEASED; urgency=low
+
+  * live-build/auto/config: Build Ubuntu and Edubuntu images with X
+    enablement stack on amd64 and i386 (LP: #1098512).  Note that this
+    requires switching those images to be built largely using metapackages
+    rather than tasks.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 11 Jan 2013 10:36:20 +0000
+
 livecd-rootfs (2.65.6) precise; urgency=low
 
   * live-build/auto/build: Use safer code for kernel handling that doesn't
diff --git a/live-build/auto/config b/live-build/auto/config
index 9d203016..1eb49acc 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -125,7 +125,18 @@ esac
 
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
-		add_task install minimal standard ubuntu-desktop
+		case $ARCH in
+			amd64|i386)
+				# We have to use metapackages rather than
+				# tasks, so that the X enablement stack can
+				# be used rather than the normal stack.
+				add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop
+				add_package install xserver-xorg-lts-quantal
+				;;
+			*)
+				add_task install minimal standard ubuntu-desktop
+				;;
+		esac
 		LIVE_TASK='ubuntu-live'
 		# This should be done automatically, but nothing updates
 		# tasks post-release at the moment.
@@ -153,7 +164,18 @@ case $PROJECT in
 		;;
 
 	edubuntu|edubuntu-dvd)
-		add_task install minimal standard edubuntu-desktop-gnome
+		case $ARCH in
+			amd64|i386)
+				# We have to use metapackages rather than
+				# tasks, so that the X enablement stack can
+				# be used rather than the normal stack.
+				add_package install ubuntu-minimal ubuntu-standard edubuntu-desktop
+				add_package install xserver-xorg-lts-quantal
+				;;
+			*)
+				add_task install minimal standard edubuntu-desktop-gnome
+				;;
+		esac
 		LIVE_TASK='edubuntu-live'
 		# This should be done automatically, but nothing updates
 		# tasks post-release at the moment.