diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x
index b97058117..72fb821b2 100644
--- a/debian/arch/arm/config.iop32x
+++ b/debian/arch/arm/config.iop32x
@@ -131,7 +131,6 @@ CONFIG_PCI=y
 #
 # CONFIG_PREEMPT is not set
 # CONFIG_NO_IDLE_HZ is not set
-# CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index 99c7f1fae..b7019817c 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -143,7 +143,6 @@ CONFIG_PCI_LEGACY_PROC=y
 #
 # CONFIG_PREEMPT is not set
 # CONFIG_NO_IDLE_HZ is not set
-# CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/debian/arch/arm/config.versatile b/debian/arch/arm/config.versatile
index 28b978481..7c36207b7 100644
--- a/debian/arch/arm/config.versatile
+++ b/debian/arch/arm/config.versatile
@@ -148,7 +148,6 @@ CONFIG_PCI=y
 #
 # CONFIG_PREEMPT is not set
 # CONFIG_NO_IDLE_HZ is not set
-# CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/debian/arch/armel/config b/debian/arch/armel/config
new file mode 100644
index 000000000..726c309c1
--- /dev/null
+++ b/debian/arch/armel/config
@@ -0,0 +1,23 @@
+CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_SLIP_SMART=y
+CONFIG_SUNRPC_GSS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CODA_FS_OLD_API is not set
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_XATTR=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_ECONET_AUNUDP=y
+CONFIG_RXRPC=m
+# CONFIG_CIFS_POSIX is not set
+CONFIG_ECONET_NATIVE=y
+CONFIG_EQUALIZER=m
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
+CONFIG_JBD=y
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_TMPFS=y
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
diff --git a/debian/arch/armel/config.iop32x b/debian/arch/armel/config.iop32x
new file mode 120000
index 000000000..716739734
--- /dev/null
+++ b/debian/arch/armel/config.iop32x
@@ -0,0 +1 @@
+../arm/config.iop32x
\ No newline at end of file
diff --git a/debian/arch/armel/config.ixp4xx b/debian/arch/armel/config.ixp4xx
new file mode 120000
index 000000000..3032f3abb
--- /dev/null
+++ b/debian/arch/armel/config.ixp4xx
@@ -0,0 +1 @@
+../arm/config.ixp4xx
\ No newline at end of file
diff --git a/debian/arch/armel/config.versatile b/debian/arch/armel/config.versatile
new file mode 120000
index 000000000..bd7f2ce48
--- /dev/null
+++ b/debian/arch/armel/config.versatile
@@ -0,0 +1 @@
+../arm/config.versatile
\ No newline at end of file
diff --git a/debian/arch/armel/defines b/debian/arch/armel/defines
new file mode 100644
index 000000000..0220800bd
--- /dev/null
+++ b/debian/arch/armel/defines
@@ -0,0 +1,23 @@
+[base]
+flavours:
+ iop32x
+ ixp4xx
+ versatile
+kernel-arch: arm
+kernel-header-dirs: arm
+
+[image]
+suggests: fdutils
+
+[iop32x]
+class: IOP32x
+longclass: IOP32x based (Thecus N2100, etc)
+
+[ixp4xx]
+class: IXP4xx
+longclass: IXP4xx based (Linksys NSLU2, etc)
+
+[versatile]
+class: Versatile
+longclass: Versatile (PB, AB, Qemu)
+
diff --git a/debian/arch/defines b/debian/arch/defines
index a61fb671f..2a7d86fb2 100644
--- a/debian/arch/defines
+++ b/debian/arch/defines
@@ -6,6 +6,7 @@ arches:
  alpha
  amd64
  arm
+ armel
  hppa
  i386
  ia64
diff --git a/debian/changelog b/debian/changelog
index 8b95de330..9c9d118f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ linux-2.6 (2.6.21~rc7-1~experimental.1) UNRELEASED; urgency=low
     CONFIG_SENSORS_ADM1029, CONFIG_FB_SVGALIB, CONFIG_FB_S3,
     CONFIG_USB_KC2190, CONFIG_KS0108.
 
+  [ Martin Michlmayr ]
+  * Add armel (arm with EABI) support.  Thanks, Lennert Buytenhek and
+    Joey Hess.  Closes: #410853.
+
  -- maximilian attems <maks@debian.org>  Tue, 10 Apr 2007 14:42:30 +0200
 
 linux-2.6 (2.6.20-3) UNRELEASED; urgency=low