diff --git a/debian/changelog b/debian/changelog
index 04bf84c6..a1d90aab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.86) UNRELEASED; urgency=low
+
+  * Reorganise code to avoid kernel installation on
+    ubuntu-server/ubuntu-core so that it works for all architectures.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 11 Sep 2012 16:56:16 +0100
+
 livecd-rootfs (2.85) quantal; urgency=low
 
   * live-build/auto/config: Set KERNEL_FLAVOURS=none for ubuntu-server as
diff --git a/live-build/auto/config b/live-build/auto/config
index 31fd7305..36b065db 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -231,17 +231,12 @@ case $PROJECT in
 
 	ubuntu-server)
 		add_task install minimal
-		OPTS="${OPTS:+$OPTS }--linux-packages=none"
-		KERNEL_FLAVOURS=none
 		COMPONENTS='main'
 		PREINSTALL_POOL_SEEDS='server-ship'
 		;;
 
 	ubuntu-core)
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
-		OPTS="${OPTS:+$OPTS }--linux-packages=none"
-		KERNEL_FLAVOURS=none
-		BINARY_REMOVE_LINUX=false
 		;;
 
 	*)
@@ -303,6 +298,14 @@ case $ARCH in
 		;;
 esac
 
+case $PROJECT in
+	ubuntu-server|ubuntu-core)
+		OPTS="${OPTS:+$OPTS }--linux-packages=none"
+		KERNEL_FLAVOURS=none
+		BINARY_REMOVE_LINUX=false
+		;;
+esac
+
 add_chroot_hook update-apt-file-cache
 add_chroot_hook update-apt-xapian-index
 add_chroot_hook update-mlocate-database