diff --git a/debian/changelog b/debian/changelog
index 4792eb6e8..03cfba760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 linux-2.6 (3.2.1-2) UNRELEASED; urgency=low
 
-  * 
+  [ Stefan Lippers-Hollmann ]
+  * udeb: Add missing modules to nic-wireless-modules:
+    - lib80211 encryption algorithms (lib80211_crypt_{wep,ccmptkip})
+      needed for e.g. ipw2x00 wlan modules (Closes: #636259)
+    - ath9k_htc, carl9170 and rt2800{pci,usb} drivers
+      (Closes: #636321, #636351, #636385)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 19 Jan 2012 05:42:57 +0000
 
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index 1c2ae8d7d..2a981dc24 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -15,18 +15,26 @@ wavelan ?
 usb8xxx ?
 ath5k ?
 ath9k ?
+ath9k_htc ?
+carl9170 ?
 iwlwifi ?
 iwl3945 ?
 b43 ?
 brcmsmac ?
 
 # rt2x00 drivers
+rt2400pci ?
 rt2500pci ?
 rt2500usb ?
-rt2400pci ?
+rt2800pci ?
+rt2800usb ?
 rt61pci ?
 rt73usb ?
 
+# lib80211 encryption algorithms
+lib80211_crypt_wep ?
+lib80211_crypt_ccmp ?
+lib80211_crypt_tkip ?
 
 # Crypto modules needed for ieee80211 WEP support
 ecb ?