diff --git a/conf/machine/imx233-olinuxino-maxi.conf b/conf/machine/imx233-olinuxino-maxi.conf
index 6770480..9c91903 100644
--- a/conf/machine/imx233-olinuxino-maxi.conf
+++ b/conf/machine/imx233-olinuxino-maxi.conf
@@ -2,18 +2,6 @@
 #@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"
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
-
-IMAGE_BOOTLOADER = "imx-bootlets"
-
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
-IMAGE_FSTYPES ?= "tar.bz2 ext3 linux.sb sdcard"
+include conf/machine/include/imx233-olinuxino.inc
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "net-persistent-mac"
-
-MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/imx233-olinuxino-micro.conf b/conf/machine/imx233-olinuxino-micro.conf
index 0435f91..a32ec7f 100644
--- a/conf/machine/imx233-olinuxino-micro.conf
+++ b/conf/machine/imx233-olinuxino-micro.conf
@@ -2,16 +2,4 @@
 #@NAME: iMX233-OLinuXino-Micro
 #@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Micro
 
-include conf/machine/include/mxs-base.inc
-
-IMXBOOTLETS_MACHINE = "stmp378x_dev"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
-
-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"
+include conf/machine/include/imx233-olinuxino.inc
diff --git a/conf/machine/imx233-olinuxino-mini.conf b/conf/machine/imx233-olinuxino-mini.conf
new file mode 100644
index 0000000..b0e4487
--- /dev/null
+++ b/conf/machine/imx233-olinuxino-mini.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: iMX233-OLinuXino-Mini
+#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Mini
+
+include conf/machine/include/imx233-olinuxino.inc
diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc
new file mode 100644
index 0000000..294c0f2
--- /dev/null
+++ b/conf/machine/include/imx233-olinuxino.inc
@@ -0,0 +1,18 @@
+# Common definitions to all iMX233-OlinuXino variants
+
+include conf/machine/include/mxs-base.inc
+
+# Add a override for all iMX233-OLinuXino variants
+SOC_FAMILY_append = "imx233-olinuxino:"
+
+IMXBOOTLETS_MACHINE = "stmp378x_dev"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
+
+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"
diff --git a/recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino-maxi.patch b/recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino.patch
similarity index 100%
rename from recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino-maxi.patch
rename to recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino.patch
diff --git a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend
index 3eaaaae..8f39b93 100644
--- a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend
+++ b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 # Board specific patches
-SRC_URI_append_imx233-olinuxino-maxi = " file://imx233-olinuxino-maxi.patch"
+SRC_URI_append_imx233-olinuxino = " file://imx233-olinuxino.patch"
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino-micro/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino-micro/defconfig
rename to recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig
diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend b/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
index 70dafd4..e2426c1 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend
@@ -1,8 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-PRINC := "${@int(PRINC) + 6}"
+PRINC := "${@int(PRINC) + 7}"
 
 # Board specific patches
-SRC_URI_append_imx233-olinuxino-maxi = " file://imx233-olinuxino.patch"
-SRC_URI_append_imx233-olinuxino-micro = " file://imx233-olinuxino.patch"
+SRC_URI_append_imx233-olinuxino = " file://imx233-olinuxino.patch"