diff --git a/debian/changelog b/debian/changelog
index 7c762f6a..9b4aa07d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.61) precise; urgency=low
+
+  [ Colin Watson ]
+  * Use lowlatency for Ubuntu Studio amd64, since lowlatency-pae is
+    i386-specific (LP: #959011).
+
+  [ Julien Lavergne ]
+  * Use generic (non-PAE) kernel for Lubuntu (LP: #958866).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 19 Mar 2012 12:53:13 +0000
+
 livecd-rootfs (2.60) precise; urgency=low
 
   * Use generic (non-PAE) kernel for Xubuntu (LP: #955009).
diff --git a/live-build/auto/config b/live-build/auto/config
index 8c4de083..c83ab897 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -164,6 +164,7 @@ case $PROJECT in
 		add_task install minimal standard lubuntu-desktop
 		LIVE_TASK='lubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
+		KERNEL_FLAVOURS=generic
 
 		# The Lubuntu STRUCTURE file has "feature
 		# no-follow-recommends".  Mirror this.
@@ -173,7 +174,10 @@ case $PROJECT in
 	ubuntustudio-dvd)
 		add_task install ubuntustudio-desktop ubuntustudio-generation ubuntustudio-recording ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-audio-plugins ubuntustudio-video
 		COMPONENTS='main restricted universe multiverse'
-		KERNEL_FLAVOURS=lowlatency-pae
+		case $ARCH in
+			i386)	KERNEL_FLAVOURS=lowlatency-pae ;;
+			amd64)	KERNEL_FLAVOURS=lowlatency ;;
+		esac
 		;;
 
 	base)