diff --git a/board/aarch64/friendlyarm-nanopi-r2s/dts/Makefile b/board/aarch64/friendlyarm-nanopi-r2s/dts/Makefile
index 22365b25c..9d32361cc 100644
--- a/board/aarch64/friendlyarm-nanopi-r2s/dts/Makefile
+++ b/board/aarch64/friendlyarm-nanopi-r2s/dts/Makefile
@@ -1 +1 @@
-dtb-y += rockchip/rk3328-nanopi-r2s.dtb
+dtb-y += rockchip/rk3328-nanopi-r2s.dtb rockchip/rk3328-nanopi-r2s-plus.dtb
diff --git a/board/aarch64/friendlyarm-nanopi-r2s/dts/rockchip/rk3328-nanopi-r2s-plus.dts b/board/aarch64/friendlyarm-nanopi-r2s/dts/rockchip/rk3328-nanopi-r2s-plus.dts
new file mode 100644
index 000000000..ece5c7d92
--- /dev/null
+++ b/board/aarch64/friendlyarm-nanopi-r2s/dts/rockchip/rk3328-nanopi-r2s-plus.dts
@@ -0,0 +1,20 @@
+#include <arm64/rockchip/rk3328-nanopi-r2s-plus.dts>
+
+#include "infix.dtsi"
+
+/ {
+	compatible = "friendlyarm,nanopi-r2s", "rockchip,rk3328";
+};
+
+&rtl8153 {
+	/*
+	 * Fix port number: device is on port 1, not port 2.
+	 */
+	reg = <1>;
+};
+
+&{/chosen/infix} {
+	/* Expose only the external USB 2.0 port for user management */
+	usb-ports = <&usb_host0_ehci>;
+	usb-port-names = "USB";
+};
diff --git a/board/aarch64/friendlyarm-nanopi-r2s/uboot/r2s-env.dtsi b/board/aarch64/friendlyarm-nanopi-r2s/uboot/r2s-env.dtsi
index 7fd318f66..adb0c492a 100644
--- a/board/aarch64/friendlyarm-nanopi-r2s/uboot/r2s-env.dtsi
+++ b/board/aarch64/friendlyarm-nanopi-r2s/uboot/r2s-env.dtsi
@@ -4,6 +4,11 @@
 			boot_targets = "mmc1";
 			ethprime = "eth0";
 
+			/* The R2S Plus has an on-board eMMC (mmc0); the plain R2S does
+			 * not.  Pick the matching kernel DT so the eMMC controller is
+			 * enabled only when the hardware is present. */
+			ixvariant = "if mmc dev 0; then setenv fdtfile rockchip/rk3328-nanopi-r2s-plus.dtb; else setenv fdtfile rockchip/rk3328-nanopi-r2s.dtb; fi";
+
 			/* This is a development platform, hard code developer mode */
 			ixbtn-devmode = "setenv dev_mode yes; echo Enabled";
 
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
index 855be6afb..a800e87c5 100644
--- a/doc/ChangeLog.md
+++ b/doc/ChangeLog.md
@@ -15,6 +15,11 @@ All notable changes to the project are documented in this file.
 - Build RPi64 SD card images in release builds
 - Include .pkg files in release builds
 
+### Added
+
+- Add NanoPi R2S Plus support (on-board 32 GB eMMC), including U-Boot
+  device tree selection so the eMMC is enabled when present
+
 ### Fixes
 
 - Fix annoying "cannot deselect all services" or reset to YANG default in the