diff --git a/debian/changelog b/debian/changelog
index 614aac0ab..d7f780bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ linux-2.6 (2.6.39~rc4-1~experimental.2) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * [powerpc] kexec: Fix build failure on 32-bit SMP
+  * net/wireless: Adjust config for iwlegacy/iwlwifi split (Closes: #624124)
+    - Enable IWLWIFI_LEGACY as module
+    - Enable IWL4965 as module; it is no longer part of the iwlagn module
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 25 Apr 2011 02:08:20 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 06977e691..c67c3ed5d 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1927,16 +1927,21 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_LIBIPW_DEBUG is not set
 
+##
+## file: drivers/net/wireless/iwlegacy/Kconfig
+##
+CONFIG_IWLWIFI_LEGACY=m
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
 ##
 ## file: drivers/net/wireless/iwlwifi/Kconfig
 ##
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
 
 ##
 ## file: drivers/net/wireless/iwmc3200wifi/Kconfig