diff --git a/target/linux/ramips/dts/mt7621_netgear_r6900-v2.dts b/target/linux/ramips/dts/mt7621_netgear_r6900-v2.dts
new file mode 100644
index 0000000000..070e59b36a
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_netgear_r6900-v2.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "mt7621_netgear_sercomm_bzv.dtsi"
+
+/ {
+	compatible = "netgear,r6900-v2", "mediatek,mt7621-soc";
+	model = "Netgear R6900 v2";
+};
+
+&leds {
+	guest_wifi {
+		gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>;
+		label = "white:guest_wifi";
+	};
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 0e78e8bf1d..f430119411 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1120,6 +1120,19 @@ define Device/netgear_r6850
 endef
 TARGET_DEVICES += netgear_r6850
 
+define Device/netgear_r6900-v2
+  $(Device/netgear_sercomm_nand)
+  DEVICE_MODEL := R6900
+  DEVICE_VARIANT := v2
+  SERCOMM_HWNAME := R6950
+  SERCOMM_HWID := BZV
+  SERCOMM_HWVER := A001
+  SERCOMM_SWVER := 0x1032
+  IMAGE_SIZE := 40960k
+  DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware
+endef
+TARGET_DEVICES += netgear_r6900-v2
+
 define Device/netgear_r7200
   $(Device/netgear_sercomm_nand)
   DEVICE_MODEL := R7200
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index 657088fb5c..c21394547f 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -82,6 +82,7 @@ netgear,wndr3700-v5)
 	;;
 netgear,r6700-v2|\
 netgear,r6800|\
+netgear,r6900-v2|\
 netgear,r7200)
 	ucidef_set_led_netdev "wan" "WAN" "white:wan" "wan"
 	ucidef_set_led_netdev "lan1" "LAN1" "white:lan1" "lan1"
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index ffed254186..bbf3e38fcd 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -72,6 +72,7 @@ platform_do_upgrade() {
 	netgear,r6700-v2|\
 	netgear,r6800|\
 	netgear,r6850|\
+	netgear,r6900-v2|\
 	netgear,r7200|\
 	netgear,wac104|\
 	netgear,wac124|\