diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
index c2aadc0d3533011ae53d64537b6992d73175b717..11e597c0e30f07c1cce19aa65c90b626feb9faa9 100644
--- a/targets/ramips-mt7621
+++ b/targets/ramips-mt7621
@@ -1,9 +1,22 @@
-# D-Link
+# BROKEN: No AP+IBSS support, 11s has high packet loss
+if [ "$BROKEN" ]; then
+
+## D-Link
 
 device d-link-dir-860l-b1 dir-860l-b1
 
 
-# Ubiquiti
+## ZBT
+
+device zbt-wg3526 zbt-wg3526
+factory
+
+fi
+
+
+# Devices without WLAN
+
+## Ubiquiti
 
 device ubnt-erx ubnt-erx
 packages '-hostapd-mini'
@@ -14,9 +27,3 @@ device ubnt-erx-sfp ubnt-erx-sfp
 packages '-hostapd-mini'
 factory
 sysupgrade '.tar'
-
-
-# ZBT
-
-device zbt-wg3526 zbt-wg3526
-factory
diff --git a/targets/targets.mk b/targets/targets.mk
index e89e13a56b169764e63418b7a6d3633850ed7053..8ee42147b16e1e3f3b4eb49d185fa4d66b4cc993 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -4,6 +4,7 @@ $(eval $(call GluonTarget,ar71xx,nand))
 $(eval $(call GluonTarget,brcm2708,bcm2708))
 $(eval $(call GluonTarget,brcm2708,bcm2709))
 $(eval $(call GluonTarget,mpc85xx,generic))
+$(eval $(call GluonTarget,ramips,mt7621))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))
 $(eval $(call GluonTarget,x86,64))
@@ -14,7 +15,6 @@ $(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
 $(eval $(call GluonTarget,ipq806x)) # BROKEN: Untested
 $(eval $(call GluonTarget,mvebu)) # BROKEN: No AP+IBSS or 11s support
 $(eval $(call GluonTarget,ramips,mt7620)) # BROKEN: No AP+IBSS support
-$(eval $(call GluonTarget,ramips,mt7621)) # BROKEN: No AP+IBSS support, 11s has high packet loss
 $(eval $(call GluonTarget,ramips,mt7628)) # BROKEN: No AP+IBSS support
 $(eval $(call GluonTarget,ramips,rt305x)) # BROKEN: No AP+IBSS support
 $(eval $(call GluonTarget,sunxi)) # BROKEN: Untested