diff --git a/package/madwifi/Config.in b/package/madwifi/Config.in
index ab24a8e2f1..7616607da3 100644
--- a/package/madwifi/Config.in
+++ b/package/madwifi/Config.in
@@ -2,13 +2,12 @@
 
 config MADWIFI_DEBUG
 	bool "Enable compilation of debugging features"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && PACKAGE_kmod-madwifi
 	default n
 
-endchoice
-
 choice
 	prompt "Rate control algorithm selection"
+	depends on PACKAGE_kmod-madwifi
 	default MADWIFI_RCA_MINSTREL
 	help
 	  This option controls how MadWifi chooses its bitrate.
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 8d11cf1c9a..27c29529ed 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -135,10 +135,7 @@ define KernelPackage/madwifi/description
 endef
 
 define KernelPackage/madwifi/config
-	menu "MadWifi Configuration"
-		depends on PACKAGE_kmod-madwifi
-		source "$(SOURCE)/Config.in"
-	endmenu
+	source "$(SOURCE)/Config.in"
 endef
 
 MAKE_ARGS:= \