diff --git a/arch/arm/boards/sysmobts/defaultenv-sysmobts/bin/prepare-ubi-rescue b/arch/arm/boards/sysmobts/defaultenv-sysmobts/bin/prepare-ubi-rescue
new file mode 100644
index 000000000..8809ab59c
--- /dev/null
+++ b/arch/arm/boards/sysmobts/defaultenv-sysmobts/bin/prepare-ubi-rescue
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if test -e /dev/nand0.rescue.ubi; then
+	exit 0
+fi
+
+ubiattach -d 0 /dev/nand0.rescue
+if [ $? != 0 ]; then
+	echo "failed to run ubiattach for rescue"
+	exit 1
+fi
+
+exit 0
diff --git a/arch/arm/boards/sysmobts/defaultenv-sysmobts/boot/rescue b/arch/arm/boards/sysmobts/defaultenv-sysmobts/boot/rescue
index 0a7f69e53..693f35710 100644
--- a/arch/arm/boards/sysmobts/defaultenv-sysmobts/boot/rescue
+++ b/arch/arm/boards/sysmobts/defaultenv-sysmobts/boot/rescue
@@ -8,4 +8,4 @@ fi
 global bootm.initrd=/mnt/rescue/initramfs
 
 global linux.bootargs.dyn.root="rdinit=/sbin/init rauc.slot=rescue"
-global linux.bootargs.dyn.mtd="mtdparts=davinci_nand.0:${nand0.partitions} ubi.mtd=root"
+global linux.bootargs.dyn.mtd="mtdparts=davinci_nand.0:${nand0.partitions} ubi.mtd=rescue"
diff --git a/arch/arm/boards/sysmobts/defaultenv-sysmobts/init/automount-nand b/arch/arm/boards/sysmobts/defaultenv-sysmobts/init/automount-nand
index 69f3fe3c4..6027a6803 100644
--- a/arch/arm/boards/sysmobts/defaultenv-sysmobts/init/automount-nand
+++ b/arch/arm/boards/sysmobts/defaultenv-sysmobts/init/automount-nand
@@ -7,4 +7,4 @@ mkdir /mnt/system1
 automount -d /mnt/system1 'prepare-ubi && mount /dev/nand0.root.ubi.system1 /mnt/system1'
 
 mkdir /mnt/rescue
-automount -d /mnt/rescue 'prepare-ubi && mount /dev/nand0.root.ubi.rescue /mnt/rescue'
+automount -d /mnt/rescue 'prepare-ubi-rescue && mount /dev/nand0.rescue.ubi.rescue /mnt/rescue'
diff --git a/arch/arm/dts/dm6442-sysmobts.dts b/arch/arm/dts/dm6442-sysmobts.dts
index 1cf31dfec..c614c81f4 100644
--- a/arch/arm/dts/dm6442-sysmobts.dts
+++ b/arch/arm/dts/dm6442-sysmobts.dts
@@ -54,8 +54,13 @@
 		};
 
 		partition@3 {
+			label = "rescue";
+			reg = <0x400000 0xd00000>;
+		};
+
+		partition@4 {
 			label = "root";
-			reg = <0x400000 0x0>;
+			reg = <0x1100000 0x0>;
 		};
 	};