diff --git a/conf/machine/imx233-olinuxino-maxi.conf b/conf/machine/imx233-olinuxino-maxi.conf
new file mode 100644
index 0000000..38878fe
--- /dev/null
+++ b/conf/machine/imx233-olinuxino-maxi.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: iMX233-OLinuXino-Maxi
+#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Maxi
+
+include conf/machine/include/mxs-base.inc
+
+IMXBOOTLETS_MACHINE = "stmp378x_dev"
+
+KERNEL_IMAGETYPE = "zImage"
+
+IMAGE_BOOTLOADER = "imx-bootlets"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 linux.sb sdcard"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"