diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 3d698335d889bdcfb6367ab2f40d6057a64e3379..956d5ebccc4d3104e3497069c44bbf17f3c06b7c 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -416,6 +416,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/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