diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index 14d630edcf170b41471319e08d74c5a40d8b783d..908547e50e563ec492724637eb2d4fe583e472ef 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -152,6 +152,9 @@ get_status_led() {
 	wr512-3gn)
 		status_led="wr512:green:wps"
 		;;
+	wr8305rt)
+		status_led="wr8305rt:sys"
+		;;
 	wnce2001)
 		status_led="netgear:green:power"
 		;;
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index b56fb634237c67b02fd32afb2a69d2600990ce7a..e958899ca1dad6ef7a081263821d38fa9e97cc28 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -120,6 +120,7 @@ case "$FIRMWARE" in
 	wnce2001 | \
 	wr512-3gn | \
 	wr6202 | \
+	wr8305rt | \
 	wrtnode | \
 	mzk-w300nh2 | \
 	ur-326n4g | \
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/01_leds b/target/linux/ramips/base-files/etc/uci-defaults/01_leds
index 00b604008e9e9de6cfda45b222eb71d196ed30d9..19ec4f59042ab4c09d2f4273b52d8382a35c8162 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ramips/base-files/etc/uci-defaults/01_leds
@@ -186,6 +186,11 @@ case $board in
 		set_wifi_led "zbtlink:blue:air"
 		set_usb_led "zbtlink:blue:usb"
 		;;
+	wr8305rt)
+		ucidef_set_led_default "power" "power" "wr8305rt:sys" "1"
+		set_usb_led "wr8305rt:usb"
+		set_wifi_led "wr8305rt:wifi"
+		;;
 esac
 
 ucidef_commit_leds
diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network
index a14acb6252ed1452c3ea215d6154687d5b076082..472ae588d5b564b2393b117b419038dd0b6e9c4f 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network
@@ -163,6 +163,13 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "6t"
 		;;
 
+	wr8305rt)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_add_switch "switch0" "1" "1"
+		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4 6t"
+		ucidef_add_switch_vlan "switch0" "2" "4 6t"
+		;;
+
 	d105 | \
 	na930 | \
 	omni-emb-hpm|\
@@ -245,6 +252,11 @@ ramips_setup_macs()
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
+	wr8305rt)
+		lan_mac=$(mtd_get_mac_binary factory 4)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
+		;;
+
 	*)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
index 8538c136ab7c8801a9ba5b313b8589ea0a0419f7..2a0a4fdc761674ba75e089d7c4e9deedf65f5738 100644
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
@@ -17,7 +17,8 @@ preinit_set_mac_address() {
 	w150m | \
 	mzk-w300nh2 |\
 	wl-330n |\
-	wl-330n3g)
+	wl-330n3g |\
+	wr8305rt)
 		mac=$(mtd_get_mac_binary factory 4)
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index 2ae8c9e8ffb81f75a65871fc10400088dca32108..b36b53c302ccefc7296081f9d5c655afa1c01cda 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -310,6 +310,9 @@ ramips_board_detect() {
 	*"Zbtlink ZBT-WA05")
 		name="zbt-wa05"
 		;;
+	*"ZBT WR8305RT")
+		name="wr8305rt"
+		;;
 	*)
 		name="generic"
 		;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 805a63fed4d08f5e67a47045610607715b757e99..8ada58b296c31d83fad8a8bc24e6514b06740bf2 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -89,6 +89,7 @@ platform_check_image() {
 	ur-336un |\
 	wr512-3gn |\
 	wmr300 |\
+	wr8305rt |\
 	wrtnode |\
 	x5 |\
 	x8 |\
diff --git a/target/linux/ramips/dts/WR8305RT.dts b/target/linux/ramips/dts/WR8305RT.dts
new file mode 100644
index 0000000000000000000000000000000000000000..81653f509d90d70bc590eb68943ceb5552ac9c15
--- /dev/null
+++ b/target/linux/ramips/dts/WR8305RT.dts
@@ -0,0 +1,108 @@
+/dts-v1/;
+
+/include/ "mt7620n.dtsi"
+
+/ {
+	compatible = "wr8305rt", "ralink,mt7620n-soc";
+	model = "ZBT WR8305RT";
+
+	palmbus@10000000 {
+		gpio1: gpio@638 {
+			status = "okay";
+		};
+		gpio3: gpio@688 {
+			status = "okay";
+		};
+
+		spi@b00 {
+			status = "okay";
+
+			m25p80@0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "mx25l6405d";
+				reg = <0 0>;
+				linux,modalias = "m25p80", "en25q64";
+				spi-max-frequency = <10000000>;
+
+				partition@0 {
+					label = "u-boot";
+					reg = <0x0 0x30000>;
+					read-only;
+				};
+
+				partition@30000 {
+					label = "u-boot-env";
+					reg = <0x30000 0x10000>;
+					read-only;
+				};
+
+				factory: partition@40000 {
+					label = "factory";
+					reg = <0x40000 0x10000>;
+					read-only;
+				};
+
+				partition@50000 {
+					label = "firmware";
+					reg = <0x50000 0x7b0000>;
+				};
+			};
+		};
+	};
+
+	ehci@101c0000 {
+		status = "okay";
+	};
+
+	ohci@101c1000 {
+		status = "okay";
+	};
+
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+		ralink,port-map = "llllw";
+	};
+
+	pinctrl {
+		state_default: pinctrl0 {
+			ephy {
+				ralink,group = "ephy";
+				ralink,function = "ephy";
+			};
+			default {
+				ralink,group = "i2c", "uartf", "spi refclk", "wled";
+				ralink,function = "gpio";
+			};
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+		sys {
+			label = "wr8305rt:sys";
+			gpios = <&gpio1 14 1>;
+		};
+		lan {
+			label = "wr8305rt:usb";
+			gpios = <&gpio1 15 1>;
+		};
+		wifi {
+			label = "wr8305rt:wifi";
+			gpios = <&gpio3 0 1>;
+		};
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <20>;
+		reset {
+			label = "reset";
+			gpios = <&gpio0 1 1>;
+			linux,code = <0x198>;
+		};
+	};
+};
+
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index e3ba60ed950b4917198bbe0242d92accd7ad11f1..25889ea0528ae6936c145e33315b1d109c58687d 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -737,6 +737,7 @@ endif
 
 Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300)
 Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U)
+Image/Build/Profile/WR8305RT=$(call BuildFirmware/Default8M/$(1),$(1),wr8305rt,WR8305RT)
 Image/Build/Profile/WRTNODE=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode,WRTNODE)
 Image/Build/Profile/ZBT-WA05=$(call BuildFirmware/Default8M/$(1),$(1),zbt-wa05,ZBT-WA05)
 
@@ -744,6 +745,7 @@ ifeq ($(SUBTARGET),mt7620n)
 define Image/Build/Profile/Default
 	$(call Image/Build/Profile/WMR300,$(1))
 	$(call Image/Build/Profile/RT-N14U,$(1))
+	$(call Image/Build/Profile/WR8305RT,$(1))
 	$(call Image/Build/Profile/WRTNODE,$(1))
 	$(call Image/Build/Profile/ZBT-WA05,$(1))
 endef