diff --git a/debian/changelog b/debian/changelog
index e118104e..3c0b5c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.17) oneiric; urgency=low
+
+  * Only set KERNEL_FLAVOURS to SUBARCH if SUBARCH is already set.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 15 Jul 2011 14:55:13 -0600
+
 livecd-rootfs (2.16) oneiric; urgency=low
 
   * Add support for building new "ubuntu-core" rootfs tarballs:
diff --git a/live-build/auto/config b/live-build/auto/config
index b41fbc81..ea017404 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -171,7 +171,7 @@ esac
 
 case $ARCH in
 	armel)
-		KERNEL_FLAVOURS="$SUBARCH"
+		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
 			dove)
 				BINARY_REMOVE_LINUX=false