diff --git a/features.in/firmware/config.mk b/features.in/firmware/config.mk
index b294a2a3..06e067fd 100644
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -18,15 +18,10 @@ use/firmware/server: use/firmware
 # NB: individual firmwarez would sometimes conflict
 #     with ones newly merged into firmware-linux
 # FIXME: kernel modules rather belong to use/hardware
-use/firmware/wireless: use/firmware
-	@$(call add,THE_KMODULES,bcmwl ndiswrapper)
+use/firmware/wireless: use/firmware use/kernel/wireless
 	@$(call add,THE_PACKAGES,firmware-acx100)
-	@#$(call add,THE_PACKAGES,firmware-i2400m)
-	@#$(call add,THE_PACKAGES_REGEXP,firmware-carl9170.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-prism.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-ipw.*)
-	@#$(call add,THE_PACKAGES_REGEXP,firmware-iwl.*)
-	@#$(call add,THE_PACKAGES_REGEXP,firmware-rt.*)
 	@$(call add,THE_PACKAGES_REGEXP,firmware-zd.*)
 
 use/firmware/laptop: use/firmware/wireless use/firmware/cpu
diff --git a/features.in/kernel/config.mk b/features.in/kernel/config.mk
index 55006540..03643e08 100644
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -13,3 +13,6 @@ use/kernel:
 use/kernel/net:
 	@$(call add,THE_KMODULES,e1000e igb)
 	@$(call add,MAIN_KMODULES,r8168 rtl8168)
+
+use/kernel/wireless:
+	@$(call add,THE_KMODULES,bcmwl ndiswrapper)