diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 408647f..8692221 100755
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -97,13 +97,13 @@
 #define CONFIG_DOS_PARTITION
 
 #if defined(CONFIG_MX6Q)
-#define CONFIG_DEFAULT_FDT_FILE		"dts/imx6q-udoo.dtb"
+#define CONFIG_DEFAULT_FDT_FILE		"imx6q-udoo.dtb"
 #else
-#define CONFIG_DEFAULT_FDT_FILE		"dts/imx6dl-udoo.dtb"
+#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-udoo.dtb"
 #endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"script=uEnv.txt\0" \
+	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc1\0" \
 	"splashpos=m,m\0" \
@@ -133,10 +133,9 @@
 	"mmcargs=setenv bootargs console=${console},${baudrate} ${video} ${memory} " \
 		"root=${mmcroot}\0" \
 	"loadbootscript=" \
-		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+		"ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${script} || fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
-		"env import -t ${loadaddr} ${filesize}; " \
-		"run uenvboot\0" \
+	"source\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
@@ -180,15 +179,16 @@
 		"fi;\0"
 
 #define CONFIG_BOOTCOMMAND \
-	"mmc dev ${mmcdev}; " \
-		"if mmc rescan; then " \
-		"if run loadbootscript; then " \
-			"run bootscript; fi; " \
-		"if run loadimage; then " \
-				"run mmcboot; " \
-		"else run netboot; " \
-		"fi; " \
-	"else run netboot; fi"
+	   "mmc dev ${mmcdev}; if mmc rescan; then " \
+		   "if run loadbootscript; then " \
+			   "run bootscript; " \
+		   "else " \
+			   "if run loadimage; then " \
+				   "run mmcboot; " \
+			   "else run netboot; " \
+			   "fi; " \
+		   "fi; " \
+		   "else run netboot; fi"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
old mode 100644
new mode 100755
index f5a540d..3f825aa
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -169,7 +169,11 @@
 	CONFIG_MFG_ENV_SETTINGS \
 	UPDATE_M4_ENV \
 	CONFIG_VIDEO_MODE \
-	"script=uEnv.txt\0" \
+	"script=boot.scr\0" \
+	"boot_prefixes=/ /boot/\0" \
+	"boot_a_script=ext2load mmc 0 ${loadaddr} ${prefix}${script}; source ${loadaddr} || fatload mmc 0 ${loadaddr} ${prefix}${script}; source ${loadaddr}\0" \
+	"scan_dev_for_boot=echo Scanning mmc ; for prefix in ${boot_prefixes}; do run scan_dev_for_scripts; done\0" \
+	"scan_dev_for_scripts=if test -e mmc 0 ${prefix}${script}; then echo Found U-Boot script ${prefix}${script}; run boot_a_script; else echo Checking here ${prefix} ... not found; fi;\0" \
 	"image=/zImage\0" \
 	"console=ttymxc0\0" \
 	"fdt_high=0xffffffff\0" \
@@ -185,7 +189,7 @@
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot} consoleblank=0\0" \
 	"loadbootscript=" \
-		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+		"run scan_dev_for_boot;\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"env import -t ${loadaddr} ${filesize}; " \
 		"run uenvboot\0" \