diff --git a/debian/changelog b/debian/changelog
index bb108ba6..34aec443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.65.4) UNRELEASED; urgency=low
+
+  * live-build/auto/config: Convince live-build to use the
+    -generic-lts-quantal kernels on Ubuntu/Edubuntu amd64/i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 03 Dec 2012 11:22:04 +0000
+
 livecd-rootfs (2.65.3) precise-proposed; urgency=low
 
   * live-build/auto/config: Manually add linux-signed-generic-lts-quantal to
diff --git a/live-build/auto/config b/live-build/auto/config
index e926fdd4..9d203016 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -134,6 +134,11 @@ case $PROJECT in
 				add_package live linux-signed-generic-lts-quantal
 				;;
 		esac
+		case $ARCH in
+			amd64|i386)
+				KERNEL_FLAVOURS=generic-lts-quantal
+				;;
+		esac
 		;;
 
 	kubuntu|kubuntu-dvd)
@@ -158,6 +163,11 @@ case $PROJECT in
 				;;
 		esac
 		COMPONENTS='main restricted universe'
+		case $ARCH in
+			amd64|i386)
+				KERNEL_FLAVOURS=generic-lts-quantal
+				;;
+		esac
 		;;
 
 	xubuntu)
@@ -289,6 +299,24 @@ lb config noauto \
 	--initramfs-compression lzma \
 	$OPTS
 
+# On some projects/architectures, we want to use backported kernels with
+# improved hardware enablement.  Unfortunately, live-build doesn't have very
+# good support for the way these are laid out: the metapackages are
+# *-generic-lts-*, but the files on disk are *-generic.  We need some
+# contortions to persuade it to do the right thing.
+case $KERNEL_FLAVOURS in
+	*-lts-*)
+		cat >> config/binary << EOF
+
+case \${0##*/} in
+	lb_binary*|build)
+		LB_LINUX_FLAVOURS="$(echo "$KERNEL_FLAVOURS" | sed 's/-lts-[^ ]*//')"
+		;;
+esac
+EOF
+		;;
+esac
+
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF
 boot/vmlinu?-*