diff --git a/package/feature-wifi/Config.in b/package/feature-wifi/Config.in
index f12390bc..87ed3852 100644
--- a/package/feature-wifi/Config.in
+++ b/package/feature-wifi/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_FEATURE_WIFI
 	select BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG
 	select BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN
 	select BR2_PACKAGE_WPA_SUPPLICANT_CLI
+	select BR2_PACKAGE_WIRELESS_REGDB
+	select BR2_PACKAGE_IW
 	help
 	  Enables WiFi in Infix. Enables all requried applications.
 
diff --git a/package/feature-wifi/feature-wifi.mk b/package/feature-wifi/feature-wifi.mk
index aa428bc7..90d5bdd3 100644
--- a/package/feature-wifi/feature-wifi.mk
+++ b/package/feature-wifi/feature-wifi.mk
@@ -10,8 +10,9 @@ FEATURE_WIFI_PACKAGE_LICENSE = MIT
 define FEATURE_WIFI_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_WLAN)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_RFKILL)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211)
-	$(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211)
+	$(call KCONFIG_SET_OPT,CONFIG_MAC80211,m)
+	$(call KCONFIG_SET_OPT,CONFIG_CFG80211,m)
+
 	$(if $(filter y,$(BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK)),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_WLAN_VENDOR_REALTEK)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_RTW88)