diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index ae9e5ea0..1150ea7a 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -217,6 +217,13 @@ ipq40xx-generic [#80211s]_
   - NBG6617
   - WRE6606
 
+ipq806x-generic [#80211s]_
+--------------------------
+
+* NETGEAR
+
+  - R7800
+
 mpc85xx-generic
 ---------------
 
diff --git a/targets/ipq806x-generic b/targets/ipq806x-generic
index c9f8915e..1b3263fc 100644
--- a/targets/ipq806x-generic
+++ b/targets/ipq806x-generic
@@ -21,13 +21,8 @@ device('tp-link-archer-c2600', 'tplink_c2600', {
 -- QCA9984
 --
 
--- -- ToDo --
--- The BROKEN flag for the target can be removed when switching to an OpenWrt base newer than 18.06,
--- as in 18.06 the LEDs are not yet functional. This is already fixed in the current OpenWrt master.
-
 -- NETGEAR
 device('netgear-nighthawk-x4s-r7800', 'netgear_r7800', {
 	factory_ext = '.img',
 	packages = QCA9984_PACKAGES,
-	broken = true,
 })
diff --git a/targets/targets.mk b/targets/targets.mk
index 63aaa09f..e143ce1d 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -17,6 +17,7 @@ $(eval $(call GluonTarget,x86,64))
 
 ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
 $(eval $(call GluonTarget,ipq40xx,generic))
+$(eval $(call GluonTarget,ipq806x,generic))
 $(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt76x8))
 $(eval $(call GluonTarget,ramips,rt305x))
@@ -25,6 +26,5 @@ endif
 ifneq ($(BROKEN),)
 $(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
 $(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
-$(eval $(call GluonTarget,ipq806x,generic)) # BROKEN: See target file for details
 $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
 endif