diff --git a/debian/changelog b/debian/changelog
index 3c0b5c30..c3206016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.18) oneiric; urgency=low
+
+  * export LB_LINUX_FLAVOURS="none" in auto/clean, so the clean
+    routine doesn't bomb out with no kernels selected.  This almost
+    certainly needs fixing in live-build, but works here for now 
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 15 Jul 2011 18:21:28 -0600
+
 livecd-rootfs (2.17) oneiric; urgency=low
 
   * Only set KERNEL_FLAVOURS to SUBARCH if SUBARCH is already set.
diff --git a/live-build/auto/clean b/live-build/auto/clean
index 4711f35d..d31d4c0d 100755
--- a/live-build/auto/clean
+++ b/live-build/auto/clean
@@ -1,6 +1,7 @@
 #! /bin/sh
 set -e
 
+export LB_LINUX_FLAVOURS="none"
 lb clean noauto "$@"
 
 rm -rf config