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