diff --git a/conf.d/server.mk b/conf.d/server.mk
index 145c30a3..40956e75 100644
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -19,12 +19,11 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
 
 distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:
 
-distro/server-ovz: distro/server-mini use/install2/net \
-	use/hdt use/rescue use/firmware/server use/power/acpi/button
+distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
+	use/firmware/server use/firmware/wireless use/power/acpi/button
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
 	@$(call add,BASE_KMODULES,rtl8168 rtl8192)
-	@$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
diff --git a/features.in/firmware/config.mk b/features.in/firmware/config.mk
index 0021554b..327b33d3 100644
--- a/features.in/firmware/config.mk
+++ b/features.in/firmware/config.mk
@@ -11,6 +11,7 @@ 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)
 	@$(call add,THE_PACKAGES,firmware-acx100)