diff --git a/debian/changelog b/debian/changelog
index e65c4db52..ed8fb88b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,7 @@ linux-2.6 (2.6.25~rc7-1~experimental.1) UNRELEASED; urgency=low
   * [hppa] Enable several filesystems.
   * Make NLS modular.
   * [i386/486] Make ext2 modular.
+  * [alpha,amd64,i386] Make ATM modular.
 
   [ Steve Langasek ]
   * topconfig: Enable CONFIG_CIFS_WEAK_PW_HASH, required for compatibility
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index b132e7d53..0a99a8ee1 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -1338,8 +1338,8 @@ CONFIG_CRC32=m
 ##
 ## file: net/atm/Kconfig
 ##
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 75d9bc86d..2f1b3fd13 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -1489,8 +1489,8 @@ CONFIG_RESOURCES_64BIT=y
 ##
 ## file: net/atm/Kconfig
 ##
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index bc508286b..97f258986 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -1753,8 +1753,8 @@ CONFIG_FLATMEM_MANUAL=y
 ##
 ## file: net/atm/Kconfig
 ##
-CONFIG_ATM=y
-CONFIG_ATM_CLIP=y
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_ATM_LANE=m
 CONFIG_ATM_MPOA=m