diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/03_wireless-wps b/target/linux/lantiq/base-files/etc/uci-defaults/03_wireless-wps
deleted file mode 100644
index e75fb8493f..0000000000
--- a/target/linux/lantiq/base-files/etc/uci-defaults/03_wireless-wps
+++ /dev/null
@@ -1,16 +0,0 @@
-. /lib/functions.sh
-. /lib/functions/lantiq.sh
-
-set_wps() {
-	uci set wireless.$1.wps_pushbutton=0
-	uci set wireless.$1.wps_device_name="OpenWrt - $(lantiq_board_model)"
-}
-
-board=$(lantiq_board_name)
-case $board in
-WBMR)
-	config_load wireless
-	config_foreach set_wps wifi-iface
-	uci commit wireless
-	;;
-esac
diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 3bb644142b..947262a952 100644
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -502,8 +502,7 @@ define Device/WBMRA
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-a kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k wpad hostapd-utils \
-	swconfig
+	kmod-ath9k wpad-mini swconfig
 endef
 TARGET_DEVICES += WBMRA
 
@@ -515,8 +514,7 @@ define Device/WBMRB
 	kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \
 	kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \
 	ltq-adsl-app ppp-mod-pppoa \
-	kmod-ath9k wpad hostapd-utils \
-	swconfig
+	kmod-ath9k wpad-mini swconfig
 endef
 TARGET_DEVICES += WBMRB