diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index bfe1416c85..b8585737ce 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -36,7 +36,8 @@ get_status_led() {
 	all0305)
 		status_led="eap7660d:green:ds4"
 		;;
-	ap136-010)
+	ap136-010|\
+	ap136-020)
 		status_led="ap136:green:status"
 		;;
 	ap81)
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network
index fe0ce03d9c..746393dd64 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network
@@ -29,6 +29,13 @@ ap136-010)
 	ucidef_add_switch_vlan "switch0" "2" "5 6"
 	;;
 
+ap136-020)
+	ucidef_set_interfaces_lan_wan "eth1" "eth0"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
+	ucidef_add_switch_vlan "switch0" "2" "5 6"
+	;;
+
 db120 |\
 rb-2011l | \
 rb-2011uas-2hnd)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index d7888638ae..34e93f3080 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -177,6 +177,9 @@ ar71xx_board_detect() {
 	*"AP136-010 reference board")
 		name="ap136-010"
 		;;
+	*"AP136-020 reference board")
+		name="ap136-020"
+		;;
 	*AP81)
 		name="ap81"
 		;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 1cfc6e3cfb..01cf4b298b 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -89,6 +89,7 @@ platform_check_image() {
 	ap121 | \
 	ap121-mini | \
 	ap136-010 | \
+	ap136-020 | \
 	ap96 | \
 	db120 | \
 	hornet-ub | \