diff --git a/buildroot-external/barebox-env/overlay/load b/buildroot-external/barebox-env/overlay/load
index 9a4bfe153..577f85111 100644
--- a/buildroot-external/barebox-env/overlay/load
+++ b/buildroot-external/barebox-env/overlay/load
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-for i in /env/overlay/*.dbto; do
+for i in /env/overlay/*.dtbo; do
 	oftree -o $i
 done
diff --git a/buildroot-external/board/rpi2/barebox-env/barebox-state-rpi.dtbo b/buildroot-external/board/rpi2/barebox-env/barebox-state-rpi.dtbo
new file mode 100644
index 000000000..99106b649
Binary files /dev/null and b/buildroot-external/board/rpi2/barebox-env/barebox-state-rpi.dtbo differ
diff --git a/buildroot-external/board/rpi2/barebox-env/init/dt-sdcard b/buildroot-external/board/rpi2/barebox-env/init/dt-sdcard
deleted file mode 100644
index 7173a84c3..000000000
--- a/buildroot-external/board/rpi2/barebox-env/init/dt-sdcard
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-of_fixup_status /soc/mmc@7e202000/
diff --git a/buildroot-external/board/rpi2/barebox.config b/buildroot-external/board/rpi2/barebox.config
index 7e21c077e..1cca2014f 100644
--- a/buildroot-external/board/rpi2/barebox.config
+++ b/buildroot-external/board/rpi2/barebox.config
@@ -37,9 +37,10 @@ CONFIG_CMD_GETOPT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_DETECT=y
-CONFIG_CMD_OF_FIXUP_STATUS=y
+CONFIG_CMD_OFTREE=y
 CONFIG_CMD_STATE=y
 CONFIG_CMD_BOOTCHOOSER=y
+CONFIG_OFTREE_OVERLAY=y
 CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SPI is not set
 CONFIG_MCI=y
diff --git a/buildroot-external/fdt/barebox-state-efi.dtb b/buildroot-external/fdt/barebox-state-efi.dtb
index fc1ead0cc..297ab8ba7 100644
Binary files a/buildroot-external/fdt/barebox-state-efi.dtb and b/buildroot-external/fdt/barebox-state-efi.dtb differ
diff --git a/buildroot-external/fdt/barebox-state-rpi.dtbo b/buildroot-external/fdt/barebox-state-rpi.dtbo
new file mode 100644
index 000000000..99106b649
Binary files /dev/null and b/buildroot-external/fdt/barebox-state-rpi.dtbo differ
diff --git a/buildroot-external/fdt/barebox-state-rpi.dtso b/buildroot-external/fdt/barebox-state-rpi.dtso
new file mode 100644
index 000000000..907baf32b
--- /dev/null
+++ b/buildroot-external/fdt/barebox-state-rpi.dtso
@@ -0,0 +1,37 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+
+	fragment@0 {
+		target = <&sdhci>;
+		__overlay__ {
+			status = "disabled";
+		};
+	};
+
+	fragment@1 {
+		target = <&sdhost>;
+		__overlay__ {
+			status = "okay";
+			partitions {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "fixed-partitions";
+
+				backend_state_sdhost: partition@22100000 {
+					label = "state";
+					reg = <0x22100000 0x800000>;
+				};
+			};
+		};
+	};
+
+	fragment@2 {
+		target = <&state>;
+		__overlay__ {
+			backend = <&backend_state_sdhost>;
+		};
+	};
+};
+
diff --git a/scripts/update-dtb.sh b/scripts/update-dtb.sh
index 2b1406320..e634c75ca 100755
--- a/scripts/update-dtb.sh
+++ b/scripts/update-dtb.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-dtc -O dtb -o buildroot-external/fdt/barebox-state-efi.dtb buildroot-external/fdt/barebox-state-efi.dts
+dtc -I dts -O dtb -o buildroot-external/fdt/barebox-state-efi.dtb buildroot-external/fdt/barebox-state-efi.dts
+
+dtc -@ -I dts -O dtb -o buildroot-external/fdt/barebox-state-rpi.dtbo buildroot-external/fdt/barebox-state-rpi.dtso