diff --git a/package/network/config/wifi-scripts/Config.in b/package/network/config/wifi-scripts/Config.in
index e77d790a0a..8134f3b9dd 100644
--- a/package/network/config/wifi-scripts/Config.in
+++ b/package/network/config/wifi-scripts/Config.in
@@ -1,3 +1,10 @@
 config WIFI_SCRIPTS_UCODE
 	bool "Use new ucode based scripts"
 	default y
+
+config WIFI_SCRIPTS_WPS_BUTTON_DISABLED
+	bool
+	prompt "Disable WPS button handling"
+	default n
+	help
+		If set, the WPS button handling logic in /etc/rc.button/wps is disabled.
diff --git a/package/network/config/wifi-scripts/Makefile b/package/network/config/wifi-scripts/Makefile
index 52edd1b567..e398bd5851 100644
--- a/package/network/config/wifi-scripts/Makefile
+++ b/package/network/config/wifi-scripts/Makefile
@@ -48,6 +48,9 @@ define Package/wifi-scripts/install
 ifeq ($(CONFIG_WIFI_SCRIPTS_UCODE),y)
 	$(CP) ./files-ucode/* $(1)/
 endif
+ifeq ($(CONFIG_WIFI_SCRIPTS_WPS_BUTTON_DISABLED),y)
+	rm -f $(1)/etc/rc.button/wps
+endif
 endef
 
 $(eval $(call BuildPackage,wifi-scripts))