diff --git a/conf/machine/nanopi-neo-plus2.conf b/conf/machine/nanopi-neo-plus2.conf
new file mode 100644
index 0000000..fae6ce0
--- /dev/null
+++ b/conf/machine/nanopi-neo-plus2.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: nanopi-neo-plus2
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo Plus2, based
+# on the Allwinner H5 SoC.
+
+require conf/machine/include/sun50i.inc
+
+PREFERRED_VERSION_u-boot = "v2018.03%"
+
+KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb"
+UBOOT_MACHINE = "nanopi_neo_plus2_defconfig"