diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 3d698335d889bdcfb6367ab2f40d6057a64e3379..bd7ed53237def1b01dbe8403e700b6ab93e77dae 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -185,6 +185,7 @@ ipq40xx-generic
 
 * GL.iNet
 
+  - GL-AP1300
   - GL-B1300
 
 * Linksys
@@ -416,6 +417,7 @@ rockchip-armv8
 * FriendlyElec
 
   - NanoPi R2S
+  - NanoPi R4S (4GB LPDDR4)
 
 sunxi-cortexa7
 --------------
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
index 5ee492ac7c1ab1e2762b1d155d58a7c0735bd1c2..597201f3a7f9187829f505dc1609d379ea8d1f81 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
@@ -102,6 +102,7 @@ local primary_addrs = {
 		}},
 		{'rockchip', 'armv8', {
 			'friendlyarm,nanopi-r2s',
+			'friendlyarm,nanopi-r4s',
 		}},
 		{'x86'},
 	}},
diff --git a/targets/ath79-nand b/targets/ath79-nand
index fff1eea8134bb903fc6b56ae17e6549bdf84e57e..62bb654b83ff6894b9c66edc2f5181425cd9b527 100644
--- a/targets/ath79-nand
+++ b/targets/ath79-nand
@@ -6,6 +6,8 @@ local ATH10K_PACKAGES_QCA9887 = {
 	'-ath10k-firmware-qca9887-ct',
 }
 
+local ATH10K_PACKAGES_QCA9888 = {}
+
 
 -- GL.iNet
 
@@ -30,3 +32,11 @@ device('netgear-wndr3700-v4', 'netgear_wndr3700-v4', {
 		'netgear-wndr3700v4', -- Upgrade from OpenWrt 19.07
 	},
 })
+
+
+-- ZTE
+
+device('zte-mf281', 'zte_mf281', {
+	broken = true,
+	packages = ATH10K_PACKAGES_QCA9888,
+})
diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
index 10464d0048af1395e416a9eb7bdb1f0e9752d176..ec5d6b706802edae282ab04a53ba7173e5a8e7a6 100644
--- a/targets/ipq40xx-generic
+++ b/targets/ipq40xx-generic
@@ -56,6 +56,13 @@ device('engenius-ens620ext', 'engenius_ens620ext', {
 
 -- GL.iNet
 
+device('gl.inet-gl-ap1300', 'glinet_gl-ap1300', {
+	factory = '-squashfs-nand-factory',
+	factory_ext = '.ubi',
+	sysupgrade = '-squashfs-nand-sysupgrade',
+	sysupgrade_ext = '.bin',
+})
+
 device('gl.inet-gl-b1300', 'glinet_gl-b1300', {
 	factory = false,
 })
diff --git a/targets/rockchip-armv8 b/targets/rockchip-armv8
index 4cd79033485ddc15be99b8fcca55bbe75c537e42..17d5bd41935635c803b4020e37afb1cc950f270a 100644
--- a/targets/rockchip-armv8
+++ b/targets/rockchip-armv8
@@ -4,3 +4,4 @@ defaults {
 }
 
 device('friendlyelec-nanopi-r2s', 'friendlyarm_nanopi-r2s')
+device('friendlyelec-nanopi-r4s', 'friendlyarm_nanopi-r4s') -- 4GB LPDDR4