diff --git a/conf/machine/merrii-a80-optimus.conf b/conf/machine/merrii-a80-optimus.conf
new file mode 100644
index 0000000..b7fa263
--- /dev/null
+++ b/conf/machine/merrii-a80-optimus.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: Merrii A80 Optimus
+#@DESCRIPTION: Machine configuration for the Merrii A80 Optimus, based on Allwinner A80 CPU https://linux-sunxi.org/Merrii_A80_Optimus_Board
+
+require conf/machine/include/sun9i.inc
+
+KERNEL_IMAGETYPE = "zImage"
+
+KERNEL_DEVICETREE = "sun9i-a80-optimus.dtb"
+UBOOT_MACHINE = "Merrii_A80_Optimus_defconfig"