diff --git a/u-boot.changes b/u-boot.changes
index 3443b01..778ffb2 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 25 16:47:54 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
+
+- set boot option to arm64 in ubootconfig.txt. This allows us to
+  theoretically build U-Boot for RPi3/4 with 32 bit.
+
 -------------------------------------------------------------------
 Mon Nov 25 14:10:58 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
 
diff --git a/u-boot.spec b/u-boot.spec
index 00f9f42..9b076fe 100644
--- a/u-boot.spec
+++ b/u-boot.spec
@@ -509,9 +509,12 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.
 install -D -m 0644 spl/boot.bin %{buildroot}%{uboot_dir}/boot.bin
 %endif
 %if "%{name}" == "u-boot-rpi3"
-echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt
 echo -e "\nkernel_address=0x11000000" >> %{buildroot}%{uboot_dir}/ubootconfig.txt
 %endif
+%if "%{name}" == "u-boot-rpi4" || "%{name}" == "u-boot-rpiarm64"
+echo -e "# Boot in AArch64 mode\narm_64bit=1" > %{buildroot}%{uboot_dir}/ubootconfig.txt
+%endif
 
 %if 0%{?is_rpi}
 %post