diff --git a/debian/changelog b/debian/changelog
index cb7d216e..e5a85a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.441.1) UNRELEASED; urgency=medium
+
+  * Setup kernel properly for ubuntu-server:live; we *do* want to build
+    kernel-generic and initrd-generic for this image. (LP: #1682460)
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Thu, 13 Apr 2017 11:14:09 -0400
+
 livecd-rootfs (2.441) zesty; urgency=medium
 
   [ Balint Reczey ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 77c33db4..198814e7 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -587,8 +587,10 @@ case $ARCH in
 		;;
 esac
 
-case $PROJECT in
-	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
+case $PROJECT:$SUBPROJECT in
+	ubuntu-server:live)
+		;;
+	ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false