diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml
index f29679f6..b9e018d5 100644
--- a/.github/workflows/build-gluon.yml
+++ b/.github/workflows/build-gluon.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ath79-generic, ath79-nand, bcm27xx-bcm2708, bcm27xx-bcm2709, ipq40xx-generic, ipq806x-generic, lantiq-xrx200, lantiq-xway, mpc85xx-p1010, mpc85xx-p1020, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, sunxi-cortexa7, x86-generic, x86-geode, x86-legacy, x86-64, bcm27xx-bcm2710, mvebu-cortexa9]
+        target: [ath79-generic, ath79-nand, bcm27xx-bcm2708, bcm27xx-bcm2709, ipq40xx-generic, ipq806x-generic, lantiq-xrx200, lantiq-xway, mpc85xx-p1010, mpc85xx-p1020, ramips-mt7620, ramips-mt7621, ramips-mt76x8, ramips-rt305x, rockchip-armv8, sunxi-cortexa7, x86-generic, x86-geode, x86-legacy, x86-64, bcm27xx-bcm2710, mvebu-cortexa9]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst
index 6f5c342e..e6e2ffec 100644
--- a/docs/user/supported_devices.rst
+++ b/docs/user/supported_devices.rst
@@ -253,6 +253,13 @@ ramips-rt305x [#deprecated]_  [#device-class-tiny]_
 
   - VoCore (8M, 16M)
 
+rockchip-armv8
+--------------
+
+* FriendlyElec
+
+  - NanoPi R2S
+
 sunxi-cortexa7
 --------------
 
diff --git a/targets/rockchip-armv8 b/targets/rockchip-armv8
new file mode 100644
index 00000000..4cd79033
--- /dev/null
+++ b/targets/rockchip-armv8
@@ -0,0 +1,6 @@
+defaults {
+	factory = false,
+	sysupgrade_ext = '.img.gz',
+}
+
+device('friendlyelec-nanopi-r2s', 'friendlyarm_nanopi-r2s')
diff --git a/targets/targets.mk b/targets/targets.mk
index a0e89738..67e87fa2 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -13,6 +13,7 @@ $(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))
 $(eval $(call GluonTarget,ramips,mt76x8))
 $(eval $(call GluonTarget,ramips,rt305x))
+$(eval $(call GluonTarget,rockchip,armv8))
 $(eval $(call GluonTarget,sunxi,cortexa7))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))