diff --git a/BuildLiveCD b/BuildLiveCD
index 0c95b67e..9372d83d 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -36,6 +36,7 @@ LIVE_BUILD=false
 UBUNTU_DEFAULTS_LOCALE=""
 
 while getopts :s:r:d:f:pa:lu: name; do case $name in
+    A)  ARCH="$OPTARG";;
     s)	SUBARCH="$OPTARG";;
     r)	SUBPROJECT="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
diff --git a/debian/changelog b/debian/changelog
index 40149dc1..5ea0f030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.44) precise; urgency=low
+
+  * Mirror armel support as armhf, so we can build all the same images.
+  * Allow ARCH to be specified on the BuildLiveCD command line as -A,
+    so that it doesn't have to be hardcoded for non-native builders.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 02 Dec 2011 11:41:13 -0700
+
 livecd-rootfs (2.43) oneiric; urgency=low
 
   * BuildLiveCD: Stop building ubuntu-defaults-image images with universe.
diff --git a/live-build/auto/config b/live-build/auto/config
index 45c9434c..109897f0 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -207,7 +207,7 @@ case $PROJECT in
 esac
 
 case $ARCH in
-	armel)
+	armel|armhf)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
 			dove)