diff --git a/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra/0018-env-enable-fit-image-support-with-mender.patch b/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra/0018-env-enable-fit-image-support-with-mender.patch
new file mode 100644
index 00000000..5f29f6e0
--- /dev/null
+++ b/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra/0018-env-enable-fit-image-support-with-mender.patch
@@ -0,0 +1,52 @@
+From fa73b07336d782652278e745ab484e2e5c679f3a Mon Sep 17 00:00:00 2001
+From: Ilies CHERGUI <ilies.chergui@gmail.com>
+Date: Thu, 20 May 2021 00:58:19 +0100
+Subject: [PATCH] env: enable fit image support with mender
+
+Signed-off-by: Ilies CHERGUI <ilies.chergui@gmail.com>
+---
+ include/env_mender.h | 24 +++++++++++++++++++-----
+ 1 file changed, 19 insertions(+), 5 deletions(-)
+
+diff --git a/include/env_mender.h b/include/env_mender.h
+index fbed122807..e02ce3ac57 100644
+--- a/include/env_mender.h
++++ b/include/env_mender.h
+@@ -144,15 +144,29 @@
+     "load ${mender_uboot_root} ${kernel_addr_r} /boot/${mender_kernel_name}; "
+ #endif
+ 
+-#define CONFIG_MENDER_BOOTCOMMAND                                       \
++#define CONFIG_MENDER_BOOTCOMMAND_COMMON                                \
+     "run mender_setup; "                                                \
+-    "setenv distro_bootpart ${mender_boot_part}; "			\
+-    "setenv distro_bootpart_hex ${mender_boot_part_hex}; "		\
+-    "setenv devnum " __stringify(MENDER_UBOOT_STORAGE_DEVICE) "; " 	\
++    "setenv distro_bootpart ${mender_boot_part}; "                      \
++    "setenv distro_bootpart_hex ${mender_boot_part_hex}; "              \
++    "setenv devnum " __stringify(MENDER_UBOOT_STORAGE_DEVICE) "; "      \
+     "setenv devtype " __stringify(MENDER_UBOOT_STORAGE_INTERFACE) "; "  \
+-    "setenv prefix /boot/; " 						\
++    "setenv prefix /boot/; "                                            \
++
++#ifndef CONFIG_FIT
++#define CONFIG_MENDER_BOOTCOMMAND                                       \
++    CONFIG_MENDER_BOOTCOMMAND_COMMON                                    \
+     "sysboot ${devtype} ${devnum}:${distro_bootpart_hex} any ${scriptaddr} ${prefix}extlinux/extlinux.conf; " \
+     "run mender_try_to_recover"
++#else
++#define CONFIG_MENDER_BOOTCOMMAND                                       \
++    CONFIG_MENDER_BOOTCOMMAND_COMMON                                    \
++    MENDER_BOOTARGS                                                     \
++    "setenv bootargs ${bootargs} ${cbootargs} ro rootwait; "            \
++    "setenv load_fitimage load ${devtype} ${devnum}:${distro_bootpart_hex} ${fit_addr} ${prefix}${mmcfit_name}; " \
++    "run load_fitimage; "                                               \
++    "bootm ${fit_addr} - ${fdt_addr}; "                                 \
++    "run mender_try_to_recover"
++#endif /* CONFIG_FIT */
+ 
+ #endif /* !MENDER_AUTO_PROBING */
+ 
+-- 
+2.17.1
+
diff --git a/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra_%.bbappend b/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra_%.bbappend
index 870e98d5..8695381d 100644
--- a/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra_%.bbappend
+++ b/layers/meta-tegrademo/recipes-bsp/u-boot/u-boot-tegra_%.bbappend
@@ -4,6 +4,7 @@ SRC_URI_append_cot = " \
   file://enable-fitimage-support.cfg \
   ${@'file://enable-fitimage-signing.cfg' if d.getVar('UBOOT_SIGN_ENABLE') == '1' else ''} \
 "
+SRC_URI_append_cot_mender-uboot = " file://0018-env-enable-fit-image-support-with-mender.patch"
 
 RDEPENDS_${PN}_remove_cot = "${PN}-extlinux"