diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge
index 83636e75f..18ee174f4 100644
--- a/debian/arch/arm/config.footbridge
+++ b/debian/arch/arm/config.footbridge
@@ -65,7 +65,8 @@ CONFIG_KMOD=y
 # CONFIG_ARCH_EP93XX is not set
 CONFIG_ARCH_FOOTBRIDGE=y
 # CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x
index 1bb9bb8f4..d6e2da515 100644
--- a/debian/arch/arm/config.iop32x
+++ b/debian/arch/arm/config.iop32x
@@ -65,7 +65,8 @@ CONFIG_KMOD=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
-CONFIG_ARCH_IOP3XX=y
+CONFIG_ARCH_IOP32X=y
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -85,25 +86,17 @@ CONFIG_ARCH_IOP3XX=y
 # CONFIG_ARCH_AT91RM9200 is not set
 
 #
-# IOP3xx Implementation Options
+# IOP32x Implementation Options
 #
 
 #
-# IOP3xx Platform Types
+# IOP32x Platform Types
 #
-# CONFIG_ARCH_IQ80321 is not set
-CONFIG_MACH_N2100=y
 CONFIG_MACH_GLANTANK=y
+CONFIG_ARCH_IQ80321=y
 CONFIG_ARCH_IQ31244=y
-# CONFIG_ARCH_IQ80331 is not set
-# CONFIG_MACH_IQ80332 is not set
-CONFIG_ARCH_EP80219=y
-CONFIG_ARCH_IOP321=y
-# CONFIG_ARCH_IOP331 is not set
-
-#
-# IOP3xx Chipset Features
-#
+CONFIG_MACH_N2100=y
+CONFIG_PLAT_IOP=y
 
 #
 # Processor Type
diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index cb4ab9b25..6b39da33d 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -63,7 +63,8 @@ CONFIG_KMOD=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 CONFIG_ARCH_IXP4XX=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410
index 635edd805..957263fd2 100644
--- a/debian/arch/arm/config.s3c2410
+++ b/debian/arch/arm/config.s3c2410
@@ -61,7 +61,8 @@ CONFIG_KMOD=y
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
diff --git a/debian/arch/arm/config.versatile b/debian/arch/arm/config.versatile
index 0d5b3f2c8..3d738dcf7 100644
--- a/debian/arch/arm/config.versatile
+++ b/debian/arch/arm/config.versatile
@@ -89,7 +89,8 @@ CONFIG_ARCH_VERSATILE=y
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
diff --git a/debian/changelog b/debian/changelog
index 781bd9c99..097ef503e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux-2.6 (2.6.19~rc6-1~experimental.1) UNRELEASED; urgency=low
   [ Martin Michlmayr ]
   * mipsel: Drop DECstation support (both r3k-kn02 and r4k-kn04).
   * arm: Drop RiscPC (rpc) support.
+  * arm: Update configs for 2.6.19-rc6.
 
  -- Bastian Blank <waldi@debian.org>  Sun, 19 Nov 2006 12:05:33 +0100