diff --git a/debian/changelog b/debian/changelog
index 806ddbc7..20c3e8c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.60) UNRELEASED; urgency=low
+
+  * Use generic (non-PAE) kernel for Xubuntu (LP: #955009).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 15 Mar 2012 18:54:16 +0000
+
 livecd-rootfs (2.59) precise; urgency=low
 
   * Switch Ubuntu Studio to lowlatency-pae kernel rather than lowlatency
diff --git a/live-build/auto/config b/live-build/auto/config
index 55232494..8c4de083 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -146,6 +146,7 @@ case $PROJECT in
 		add_package install xterm
 		LIVE_TASK='xubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
+		KERNEL_FLAVOURS=generic
 		;;
 
 	ubuntu-netbook)