diff --git a/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch b/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch
new file mode 100644
index 0000000..b93acf7
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec/u-boot-congatec-Change_environment_variables.patch
@@ -0,0 +1,46 @@
+From 6a87d9cc6bed6956683f7e6305b337a29502b147 Mon Sep 17 00:00:00 2001
+From: Alex de Cabo <alejandro.de-cabo-garcia@congatec.com>
+Date: Tue, 23 Sep 2014 15:17:56 +0200
+Subject: [PATCH] u-boot-congatec: Change environment variables
+
+Changes the loadfdt, loaduimage and mmcroot variables to be
+Yocto community standard compatible
+---
+ include/configs/cgt_qmx6.h        | 4 ++--
+ include/configs/cgt_qmx6_common.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/configs/cgt_qmx6.h b/include/configs/cgt_qmx6.h
+index c3278e5..e636ce7 100644
+--- a/include/configs/cgt_qmx6.h
++++ b/include/configs/cgt_qmx6.h
+@@ -20,8 +20,8 @@
+ #define CONFIG_MACH_TYPE	4122
+ #define CONFIG_MXC_UART_BASE	UART2_BASE
+ #define CONFIG_CONSOLE_DEV		"ttymxc1"
+-#define CONFIG_MMCROOT			"/dev/mmcblk0p1"
+-#define CONFIG_BOOTFS			"ext2"
++#define CONFIG_MMCROOT			"/dev/mmcblk0p2"
++#define CONFIG_BOOTFS			"fat"
+ 
+ #include "cgt_qmx6_common.h"
+ #include <asm/arch/imx-regs.h>
+diff --git a/include/configs/cgt_qmx6_common.h b/include/configs/cgt_qmx6_common.h
+index 31a7b7e..b234e46 100644
+--- a/include/configs/cgt_qmx6_common.h
++++ b/include/configs/cgt_qmx6_common.h
+@@ -170,9 +170,9 @@
+ 	"bootscript=echo Running bootscript from mmc ...; " \
+ 		"source\0" \
+ 	"loaduimage=" \
+-		CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${uimage}\0" \
++		CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ 	"loadfdt=" \
+-		CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdt_file}\0" \
++		CONFIG_BOOTFS "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ 	"mmcboot=echo Booting from mmc ...; " \
+ 		"run mmcargs; " \
+ 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+-- 
+1.9.1
+
diff --git a/recipes-bsp/u-boot/u-boot-congatec_2013.04.bb b/recipes-bsp/u-boot/u-boot-congatec_2013.04.bb
new file mode 100644
index 0000000..4161329
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-congatec_2013.04.bb
@@ -0,0 +1,23 @@
+# Congatec QMX6 u-boot
+
+require recipes-bsp/u-boot/u-boot.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+
+
+PROVIDES += "u-boot"
+
+PV = "2013.04"
+
+SRCREV = "6388c474189b42c07bb865dd604c74483da099f3"
+SRCBRANCH = "cgt_imx_v2013.04_3.10.17_1.0.0"
+
+SRC_URI = "git://git.congatec.com/arm/qmx6_uboot.git;protocol=http;branch=${SRCBRANCH} \
+	   file://u-boot-congatec-Change_environment_variables.patch \
+"
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(cgtqmx6)"