diff --git a/conf/machine/olinuxino-a20som.conf b/conf/machine/olinuxino-a20som.conf
new file mode 100644
index 0000000..3aff740
--- /dev/null
+++ b/conf/machine/olinuxino-a20som.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: Olimex A20-SOM
+#@DESCRIPTION: Machine configuration for the Olimex A20-SOM Evaluation Board, based on Allwinner A20 CPU
+#https://github.com/OLIMEX/SOM
+
+require conf/machine/include/tune-cortexa7.inc
+require conf/machine/include/sunxi.inc
+require conf/machine/include/sunxi-mali.inc
+
+UBOOT_MACHINE = "A20-SOM_config"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"