diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x
index 1bb9bb8f4..888d3f4b3 100644
--- a/debian/arch/arm/config.iop32x
+++ b/debian/arch/arm/config.iop32x
@@ -396,6 +396,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
@@ -935,6 +941,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index 437ebc5d7..ec6e6e41c 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -425,6 +425,12 @@ CONFIG_TIPC_PORTS=8191
 CONFIG_TIPC_LOG=0
 # CONFIG_TIPC_DEBUG is not set
 CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
@@ -891,6 +897,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
diff --git a/debian/changelog b/debian/changelog
index 360cc0d9b..29eff5727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,7 +52,8 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
   * arm: Set CONFIG_BINFMT_MISC=m
-  * arm/ixp4xx: Set CONFIG_ATM=m so CONFIG_USB_ATM has an effect.
+  * arm/ixp4xx: Set CONFIG_ATM=m (and related modules) so CONFIG_USB_ATM has
+    an effect.
   * arm/iop32x: Likewise.
   * arm/s3c2410: Unset CONFIG_PM_LEGACY.
   * arm/versatile: Fix Versatile PCI config byte accesses