diff --git a/debian/changelog b/debian/changelog
index 938aa1cc..7fcbe5b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ debian-cd (3.1.8) UNRELEASED; urgency=low
       equivalents are in place already.
   * tools/generate_firmware_task: Add LOCALDEBS support
   * Add more armel kernel flavours
+  * Add armhf as a known architecture, merging common armel/armhf boot
+    setup scripts.
 
   [ Joey Hess ]
   * Read tasksel's debian-tasks.desc from its new location.
diff --git a/tools/boot/wheezy/boot-arm b/tools/boot/wheezy/boot-arm
new file mode 100644
index 00000000..c735db8a
--- /dev/null
+++ b/tools/boot/wheezy/boot-arm
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Do install stuff for arm*, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+#
+# This is copied from the old arm script and it is currently disabled as there
+# don't seem to be any bootable armel/armhf machines.
+
+. $BASEDIR/tools/boot/$CODENAME/common.sh
+
+set -e
+
+N=$1
+CDDIR=$2
+if [ "$DI_WWW_HOME" = "default" ];then
+    if [ "$ARCH" = armel ]; then
+	    DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily"
+    else
+	    DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily"
+    fi
+    if [ -n "$DI_DIR" ];then
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_WWW_HOME=""                     
+        echo "Using images from $DI_DIR"
+    fi
+fi
+if [ ! "$DI_DIST" ]; then
+    DI_DIST="$DI_CODENAME"
+fi
+
+cd $CDDIR/..
+
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+
+# Arm* is currently not bootable directly from CD in wheezy, so bail out here
+echo "Armel/armhf booting disabled, check with Sledge"
+exit 0
diff --git a/tools/boot/wheezy/boot-armel b/tools/boot/wheezy/boot-armel
index 66a3888c..a5659af3 100755
--- a/tools/boot/wheezy/boot-armel
+++ b/tools/boot/wheezy/boot-armel
@@ -1,61 +1,2 @@
-#!/bin/sh
-#
-# Do install stuff for armel, including making bootable CDs
-# Works with debian-installer
-#
-# $1 is the CD number
-# $2 is the temporary CD build dir
-#
-# This is copied from the arm script and it is currently disabled as there
-# doesn't seem to be any bootable armel machines.
-
-. $BASEDIR/tools/boot/$CODENAME/common.sh
-
-set -e
-
-N=$1
-CDDIR=$2
-INSTALLDIR=$CDDIR/install
-if [ "$DI_WWW_HOME" = "default" ];then
-	DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily"
-   if [ -n "$DI_DIR" ];then
-       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
-       DI_WWW_HOME=""                     
-   fi
-fi
-if [ ! "$DI_DIST" ]; then
-   DI_DIST="$DI_CODENAME"
-fi
-
-cd $CDDIR/..
-
-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
-
-# Armel is currently not bootable in wheezy, so bail out here
-echo "Armel booting disabled, check with Sledge/fjp/tbm"
-exit 0
-
-# Only disk 1* bootable
-if [ $N != 1 ] && [ $N != 1_NONUS ]; then
-	exit 0
-fi
-
-cd $INSTALLDIR
-
-# Netwinder currently disabled - fails to boot at the moment, as it's too big. SAM 2008/03/05 
-#for subarch in netwinder; do
-#	if [ ! "$DI_WWW_HOME" ];then
-#		if [ ! "$DI_DIR" ];then
-#		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
-#		fi
-#		DI_DIR2="$DI_DIR/$subarch/cdrom"
-#	else
-#		DI_DIR2="di_stuff"
-#		wget -r -nd --no-parent --level=1 -P "$DI_DIR2" "$DI_WWW_HOME/$subarch/cdrom/"
-#		rm -f "$DI_DIR2"/index*
-#	fi
-#	cp -a "$DI_DIR2" "$subarch"
-#	rm -rf di_stuff
-#done
-
-exit 0
+#!/bin/bash
+. $BASEDIR/tools/boot/$DI_CODENAME/boot-arm
diff --git a/tools/boot/wheezy/boot-armhf b/tools/boot/wheezy/boot-armhf
new file mode 100644
index 00000000..a5659af3
--- /dev/null
+++ b/tools/boot/wheezy/boot-armhf
@@ -0,0 +1,2 @@
+#!/bin/bash
+. $BASEDIR/tools/boot/$DI_CODENAME/boot-arm
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index c3f28cde..572fc754 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -179,6 +179,14 @@ linux-image-orion5x
 linux-image-versatile
 #endif
 
+#ifdef ARCH_armhf
+initramfs-tools
+busybox
+flash-kernel
+linux-image-mx5
+linux-image-omap
+#endif
+
 #ifdef ARCH_sparc
 initramfs-tools
 busybox
diff --git a/update-cd b/update-cd
index 7682238e..cb615bf6 100755
--- a/update-cd
+++ b/update-cd
@@ -90,7 +90,7 @@ CAPCODE=`perl -e "print ucfirst("$CODENAME")"`
 export FIRSTVER CAPCODE
 
 if [ "$ARCHLIST"x = ""x ] ; then
-    ARCHLIST="armel amd64 i386 ia64 mips mipsel powerpc s390 sparc source kfreebsd-amd64 kfreebsd-i386" # amd64 # all dealt with specially
+    ARCHLIST="armel armhf amd64 i386 ia64 mips mipsel powerpc s390 sparc source kfreebsd-amd64 kfreebsd-i386" # amd64 # all dealt with specially
 fi
 
 export TDIR NONFREE VER MIRROR CODENAME OUT BASEDIR