diff --git a/projects/imx6/options b/projects/imx6/options
index d0cf707f99..74efdb35d6 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -42,6 +42,8 @@
 
   # Configuration for u-boot
     UBOOT_CONFIG="mx6_cubox-i_config"
+    UBOOT_CONFIG="$UBOOT_CONFIG matrix"
+    UBOOT_CONFIG="$UBOOT_CONFIG udoo_quad_config"
 
   # Target Configfile for u-boot
     UBOOT_CONFIGFILE=""
@@ -52,6 +54,8 @@
   # Kernel extra targets to build
     KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb imx6dl-cubox-i.dtb"
     KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-hummingboard.dtb imx6dl-hummingboard.dtb"
+    KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-tbs2910.dtb"
+    KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-udoo.dtb"
 
   # Additional kernel make parameters (for example to specify the u-boot loadaddress)
     KERNEL_MAKE_EXTRACMD=""
diff --git a/scripts/image b/scripts/image
index 9139c1c460..f2960b0875 100755
--- a/scripts/image
+++ b/scripts/image
@@ -47,6 +47,10 @@ if [ "$DEVEL_VERSION" = "devel" ] ; then
   IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION"
 fi
 
+if [ "$PROJECT" == "imx6" -a -n "$SYSTEM" ]; then
+  IMAGE_NAME="$IMAGE_NAME-$SYSTEM"
+fi
+
 if [ -n "$IMAGE_SUFFIX" ]; then
   IMAGE_NAME="$IMAGE_NAME-$IMAGE_SUFFIX"
 fi
@@ -274,6 +278,15 @@ fi
           fi
         fi
 
+      # MfgTool2 for TBS Matrix support (add it to .tar)
+      # only for matrix system or all? (one tar for all updates?)
+        if [ "$PROJECT" == "imx6" -a "$SYSTEM" == "matrix" ]; then
+          $SCRIPTS/unpack imx6-mfgtool2-tbs-matrix
+          
+          mkdir -p $RELEASE_DIR/MfgTool2-TBS-Matrix
+          cp -PR $BUILD/imx6-mfgtool2-tbs-matrix-*/imx6-mfgtool2-tbs-matrix-*/* $RELEASE_DIR/MfgTool2-TBS-Matrix
+        fi
+
         cp $ROOT/README* $RELEASE_DIR
         cp $ROOT/CHANGELOG* $RELEASE_DIR
         echo "$TARGET_VERSION" > $RELEASE_DIR/RELEASE
@@ -288,7 +301,6 @@ fi
       mkdir -p $RELEASE_DIR/target
         cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/target/SYSTEM
         cp $TARGET_IMG/$IMAGE_NAME.kernel $RELEASE_DIR/target/KERNEL
-
     # create md5sum's
       ( cd $RELEASE_DIR;
         md5sum -t target/SYSTEM > target/SYSTEM.md5;
@@ -310,6 +322,16 @@ fi
         if [ -z "$KERNEL_NAME" ] ; then
           KERNEL_NAME="KERNEL"
         fi
+
+        UBOOT_SYSTEM=""
+        if [ "$PROJECT" == "imx6" ]; then
+          if [ -n "$SYSTEM" ]; then
+            UBOOT_SYSTEM="$SYSTEM"
+          else
+            UBOOT_SYSTEM="cuboxi"
+          fi
+        fi
+
         echo "mkimage: boo. now root access (sudo) is required..."
         echo "mkimage: see scripts/image and scripts/mkimage if you dont trust us :)"
         # variables used in image script must be passed
@@ -324,6 +346,7 @@ fi
           RELEASE_DIR="$RELEASE_DIR" \
           UUID_SYSTEM="$(uuidgen)" \
           UUID_STORAGE="$(uuidgen)" \
+          UBOOT_SYSTEM="$UBOOT_SYSTEM" \
           $SCRIPTS/mkimage
       fi
 
diff --git a/scripts/mkimage b/scripts/mkimage
index f189f5c5e8..aeb4f6c3d6 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -173,15 +173,21 @@ EOF
 elif [ "$BOOTLOADER" = "u-boot" ]; then
   # create bootloader configuration
     echo "image: creating bootloader configuration..."
-    if [ -f "$RELEASE_DIR/3rdparty/bootloader/uEnv.txt" ]; then
+    if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/uEnv-$UBOOT_SYSTEM.txt" ]; then
+      cp "$RELEASE_DIR/3rdparty/bootloader/uEnv-$UBOOT_SYSTEM.txt" "$OE_TMP/uEnv.txt"
+    elif [ -f "$RELEASE_DIR/3rdparty/bootloader/uEnv.txt" ]; then
       cp $RELEASE_DIR/3rdparty/bootloader/uEnv.txt "$OE_TMP"
     elif [ -f "$RELEASE_DIR/3rdparty/bootloader/boot.scr" ]; then
       cp $RELEASE_DIR/3rdparty/bootloader/boot.scr "$OE_TMP"
     fi
 
     echo "image: installing u-boot bootloader..."
-    if [ -f "$RELEASE_DIR/3rdparty/bootloader/SPL" ]; then
+    if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/SPL-$UBOOT_SYSTEM" ]; then
+      dd if="$RELEASE_DIR/3rdparty/bootloader/SPL-$UBOOT_SYSTEM" of="$DISK" bs=512 seek=2 conv=notrunc
+    elif [ -f "$RELEASE_DIR/3rdparty/bootloader/SPL" ]; then
       dd if="$RELEASE_DIR/3rdparty/bootloader/SPL" of="$DISK" bs=512 seek=2 conv=notrunc
+    elif [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.imx" ]; then
+      dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.imx" of="$DISK" bs=512 seek=2 conv=notrunc
     elif [ -f "$RELEASE_DIR/3rdparty/bootloader/u-boot.imx" ]; then
       dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot.imx" of="$DISK" bs=512 seek=2 conv=notrunc
     fi
@@ -189,7 +195,10 @@ elif [ "$BOOTLOADER" = "u-boot" ]; then
     echo "image: copying files to part1..."
     cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/$KERNEL_NAME"
     cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM"
-    if [ -f $RELEASE_DIR/3rdparty/bootloader/u-boot.img ] ; then
+
+    if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.img" ]; then
+      cp "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.img" "$OE_TMP/u-boot.img"
+    elif [ -f $RELEASE_DIR/3rdparty/bootloader/u-boot.img ]; then
       cp $RELEASE_DIR/3rdparty/bootloader/u-boot.img "$OE_TMP"
     fi