diff --git a/debian/arch/config b/debian/arch/config
index f5aaaa203..8d5c7a682 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -899,6 +899,11 @@ CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_CPIA2=m
 CONFIG_BCM43XX_PIO=y
 CONFIG_WIRELESS_EXT=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_SND_ALS300=m
diff --git a/debian/changelog b/debian/changelog
index 4f27364f3..a97f28183 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK.
   * Enable WLAN_PRE80211 and WLAN_80211 on all archs with NET_RADIO enabled.
   * Fix RTC_INTF_{DEV,SYSFS,PROC}=y where enabled modular.
+  * Enable new wirless stack mac80211 and improved wireless conf api.
 
- -- maximilian attems <maks@debian.org>  Mon, 21 May 2007 18:56:48 +0200
+ -- maximilian attems <maks@debian.org>  Mon, 21 May 2007 22:23:36 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low