diff --git a/debian/changelog b/debian/changelog
index b24543c37..c02f17620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ linux (3.10.10-1) UNRELEASED; urgency=low
   * [armel]: Enable MVMDIO and USB_EHCI_HCD_ORION on Kirkwood and Orion
     (Closes: #719680)
   * Bump ABI to 3
+  * [armhf]: Add udebs for armmp flavour
 
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 30 Aug 2013 02:31:22 +0100
 
diff --git a/debian/installer/armhf/kernel-versions b/debian/installer/armhf/kernel-versions
index cf3465a79..55b5ade21 100644
--- a/debian/installer/armhf/kernel-versions
+++ b/debian/installer/armhf/kernel-versions
@@ -1,3 +1,4 @@
 # arch version flavour  installedname suffix build-depends
+armhf  -       armmp    -             y      -
 armhf  -       mx5      -             y      -
 armhf  -       vexpress -             y      -
diff --git a/debian/installer/armhf/modules/armhf-armmp/ata-modules b/debian/installer/armhf/modules/armhf-armmp/ata-modules
new file mode 100644
index 000000000..04d9c8841
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/ata-modules
@@ -0,0 +1 @@
+libata
diff --git a/debian/installer/armhf/modules/armhf-armmp/btrfs-modules b/debian/installer/armhf/modules/armhf-armmp/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
new file mode 100644
index 000000000..f05d06298
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -0,0 +1 @@
+#include <core-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/crc-modules b/debian/installer/armhf/modules/armhf-armmp/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules b/debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/crypto-modules b/debian/installer/armhf/modules/armhf-armmp/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/event-modules b/debian/installer/armhf/modules/armhf-armmp/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/ext2-modules b/debian/installer/armhf/modules/armhf-armmp/ext2-modules
new file mode 100644
index 000000000..c407140bf
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/ext2-modules
@@ -0,0 +1 @@
+#include <ext2-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/ext3-modules b/debian/installer/armhf/modules/armhf-armmp/ext3-modules
new file mode 100644
index 000000000..bbdd7f4b7
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/ext3-modules
@@ -0,0 +1 @@
+#include <ext3-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/ext4-modules b/debian/installer/armhf/modules/armhf-armmp/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/fat-modules b/debian/installer/armhf/modules/armhf-armmp/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/fuse-modules b/debian/installer/armhf/modules/armhf-armmp/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/input-modules b/debian/installer/armhf/modules/armhf-armmp/input-modules
new file mode 100644
index 000000000..1a248663b
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/input-modules
@@ -0,0 +1,4 @@
+#include <input-modules>
+usbhid -
+usbmouse -
+usbkbd -
diff --git a/debian/installer/armhf/modules/armhf-armmp/isofs-modules b/debian/installer/armhf/modules/armhf-armmp/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/jfs-modules b/debian/installer/armhf/modules/armhf-armmp/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/kernel-image b/debian/installer/armhf/modules/armhf-armmp/kernel-image
new file mode 100644
index 000000000..1bb8bf6d7
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/kernel-image
@@ -0,0 +1 @@
+# empty
diff --git a/debian/installer/armhf/modules/armhf-armmp/loop-modules b/debian/installer/armhf/modules/armhf-armmp/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/md-modules b/debian/installer/armhf/modules/armhf-armmp/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
new file mode 100644
index 000000000..5f0b5d75a
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@ -0,0 +1,2 @@
+#include <mmc-modules>
+sdhci-esdhc-imx
diff --git a/debian/installer/armhf/modules/armhf-armmp/multipath-modules b/debian/installer/armhf/modules/armhf-armmp/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/nbd-modules b/debian/installer/armhf/modules/armhf-armmp/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-modules b/debian/installer/armhf/modules/armhf-armmp/nic-modules
new file mode 100644
index 000000000..0dcebabfe
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/nic-modules
@@ -0,0 +1,5 @@
+mvneta
+mvmdio
+smsc911x
+sun4i-emac
+xgmac
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-shared-modules b/debian/installer/armhf/modules/armhf-armmp/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-usb-modules b/debian/installer/armhf/modules/armhf-armmp/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules b/debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/pata-modules b/debian/installer/armhf/modules/armhf-armmp/pata-modules
new file mode 100644
index 000000000..2ff7276d4
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/pata-modules
@@ -0,0 +1 @@
+pata_imx
diff --git a/debian/installer/armhf/modules/armhf-armmp/sata-modules b/debian/installer/armhf/modules/armhf-armmp/sata-modules
new file mode 100644
index 000000000..40972b35d
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/sata-modules
@@ -0,0 +1,4 @@
+#include <sata-modules>
+ahci_platform
+sata_highbank
+
diff --git a/debian/installer/armhf/modules/armhf-armmp/scsi-core-modules b/debian/installer/armhf/modules/armhf-armmp/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/squashfs-modules b/debian/installer/armhf/modules/armhf-armmp/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/udf-modules b/debian/installer/armhf/modules/armhf-armmp/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/uinput-modules b/debian/installer/armhf/modules/armhf-armmp/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-storage-modules b/debian/installer/armhf/modules/armhf-armmp/usb-storage-modules
new file mode 100644
index 000000000..6938b5cf1
--- /dev/null
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+usb-storage -