diff --git a/conf/machine/nanopi-m1.conf b/conf/machine/nanopi-m1.conf
new file mode 100644
index 0000000..de96acf
--- /dev/null
+++ b/conf/machine/nanopi-m1.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: NanoPi M1
+#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo, based on #the Allwinner H3 CPU
+
+require conf/machine/include/sun8i.inc
+
+KERNEL_DEVICETREE = "sun8i-h3-nanopi-m1.dtb"
+UBOOT_MACHINE = "nanopi_m1_defconfig"