diff --git a/debian/changelog b/debian/changelog
index 7c762f6a..e1c9d75c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.61) UNRELEASED; urgency=low
+
+  * Use generic (non-PAE) kernel for Lubuntu (LP: #958866).
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 18 Mar 2012 18:43:46 +0100
+
 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..abffd529 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.