diff --git a/debian/changelog b/debian/changelog
index 23b99d7db..24d72ab94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux-2.6 (2.6.39~rc4-1~experimental.1) UNRELEASED; urgency=low
   * [i386] Rename '686-bigmem' flavour to '686-pae'; remove '686' flavour.
     For 686-class systems without PAE, the '486' flavour is more efficient
     than the '686' flavour due to optimisation for uniprocessor systems.
+  * Add armhf architecture with mx5 flavour, thanks to Hector Oron and
+    Vagrant Cascadian
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 06 Apr 2011 14:02:37 +0100
 
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
new file mode 100644
index 000000000..768373bbe
--- /dev/null
+++ b/debian/config/armhf/config
@@ -0,0 +1,34 @@
+##
+## file: arch/arm/Kconfig
+##
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+#. Enable floating point unit
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+
+##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+# CONFIG_BPQETHER is not set
+# CONFIG_BAYCOM_SER_FDX is not set
+# CONFIG_BAYCOM_SER_HDX is not set
+# CONFIG_BAYCOM_PAR is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_YAM is not set
+
+##
+## file: init/Kconfig
+##
+## choice: Kernel compression mode
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+## end choice
diff --git a/debian/config/armhf/config.mx5 b/debian/config/armhf/config.mx5
new file mode 100644
index 000000000..664a83131
--- /dev/null
+++ b/debian/config/armhf/config.mx5
@@ -0,0 +1,149 @@
+##
+## file: arch/arm/Kconfig
+##
+## choice: ARM system type
+CONFIG_ARCH_MXC=y
+## end choice
+#. Enable NEON SIMD support
+CONFIG_NEON=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+
+##
+## file: arch/arm/plat-mxc/Kconfig
+##
+#. enable MX5, otherwise it defaults to MX3 and ignores MACH_MX51_EFIKAMX
+CONFIG_ARCH_MX5=y
+#. Enable PWM driver
+CONFIG_MXC_PWM=y
+
+##
+## file: arch/arm/mach-mx5/Kconfig
+##
+CONFIG_MACH_MX51_EFIKAMX=y
+
+##
+## file: drivers/cpufreq/Kconfig
+##
+#. cpufreq driver for i.MX CPU
+CONFIG_CPU_FREQ_IMX=m
+
+## 
+## file: drivers/dma/Kconfig
+## 
+CONFIG_DMADEVICES=y
+CONFIG_IMX_SDMA=y
+
+##
+## file: drivers/gpio/Kconfig
+##
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+
+## 
+## file: drivers/hid/Kconfig
+##
+CONFIG_USB_HID=y
+
+## 
+## file: drivers/i2c/Kconfig
+## 
+CONFIG_I2C_IMX=y
+
+## 
+## file: drivers/leds/Kconfig
+## 
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+
+## 
+## file: drivers/mfd/Kconfig
+## 
+CONFIG_MFD_MC13XXX=y
+
+## 
+## file: drivers/mmc/Kconfig
+## 
+CONFIG_MMC=m
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MMC_MXC=y
+
+## 
+## file: drivers/mtd/Kconfig
+## 
+#. Efika has SPI NOR MTD device
+CONFIG_MTD=m
+
+## 
+## file: drivers/power/Kconfig
+## 
+CONFIG_POWER_SUPPLY=y
+
+## 
+## file: drivers/regulator/Kconfig
+## 
+#. Provide dummy if lookup fails
+CONFIG_REGULATOR_DUMMY=y
+#. It is not set at top level
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
+#. Included as module, should not be regulator stuff included as built-in?
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+CONFIG_REGULATOR_MC13892=y
+
+## 
+## file: drivers/rtc/Kconfig
+## 
+CONFIG_RTC_LIB=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_MC13XXX=y
+
+## 
+## file: drivers/spi/Kconfig
+## 
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_IMX_VER_0_7=y
+CONFIG_SPI_IMX_VER_2_3=y
+CONFIG_SPI_IMX=y
+
+##
+## file: drivers/ssb/Kconfig
+##
+CONFIG_SSB_POSSIBLE=y
+
+## 
+## file: drivers/tty/serial/Kconfig
+## 
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+
+##
+## file: drivers/usb/Kconfig
+## 
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_ULPI=y
+
+## 
+## file: drivers/watchdog/Kconfig
+## 
+CONFIG_IMX2_WDT=y
+
+## 
+## file: sound/Kconfig
+## 
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_MXC_SOC_MX2=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_AC97_BUS=m
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
new file mode 100644
index 000000000..0abc827e9
--- /dev/null
+++ b/debian/config/armhf/defines
@@ -0,0 +1,17 @@
+[base]
+flavours:
+ mx5
+kernel-arch: arm
+
+[image]
+suggests: fdutils
+configs:
+ armel/config
+ armhf/config
+
+[mx5_build]
+image-file: arch/arm/boot/zImage
+
+[mx5_description]
+hardware: Freescale MXC/iMX-based
+hardware-long: Support for Freescale MXC/iMX-based family of processors
diff --git a/debian/config/defines b/debian/config/defines
index 2824d1ac0..e2a9bf502 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -6,6 +6,7 @@ arches:
  alpha
  amd64
  armel
+ armhf
  hppa
  i386
  ia64