diff --git a/core/linux-raspberrypi4/PKGBUILD b/core/linux-raspberrypi4/PKGBUILD
index 1bf67017e..7ee8e32d0 100644
--- a/core/linux-raspberrypi4/PKGBUILD
+++ b/core/linux-raspberrypi4/PKGBUILD
@@ -11,7 +11,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi 4"
 pkgver=5.4.83
-pkgrel=2
+pkgrel=3
 arch=('armv7h' 'aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -36,7 +36,7 @@ md5sums=('6c8790707ffc9440e1bcae20b697e9ec'
 md5sums_armv7h=('0fc39bc5d19ba8503011ab5e033de67d'
                 '7c6b37a1353caccf6d3786bb4161c218')
 md5sums_aarch64=('80fb4289dfeca2f541416e5cf0dd3a81'
-                 '1cac5b1e040fd4bd6535cb6d0ffe487c')
+                 '84a781813024e320245be08b9e260902')
 
 # setup vars
 [[ $CARCH == "armv7h" ]] && _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt
@@ -111,6 +111,13 @@ _package() {
   make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
   make INSTALL_DTBS_PATH="${pkgdir}/boot" dtbs_install
 
+  if [[ $CARCH == "aarch64" ]]; then
+    # drop hard-coded devicetree=foo.dtb in /boot/config.txt for
+    # autodetected load of supported of models at boot
+    find "${pkgdir}/boot/broadcom" -type f -print0 | xargs -0 mv -t "${pkgdir}/boot"
+    rmdir "${pkgdir}/boot/broadcom"
+  fi
+
   cp arch/$KARCH/boot/$_image "${pkgdir}/boot/$_kernel"
 
   cp arch/$KARCH/boot/dts/overlays/README "${pkgdir}/boot/overlays"
diff --git a/core/linux-raspberrypi4/config8.txt b/core/linux-raspberrypi4/config8.txt
index 1d295bdd3..7b2380bf9 100644
--- a/core/linux-raspberrypi4/config8.txt
+++ b/core/linux-raspberrypi4/config8.txt
@@ -4,5 +4,4 @@ gpu_mem=64
 initramfs initramfs-linux.img followkernel
 kernel=kernel8.img
 arm_64bit=1
-device_tree=broadcom/bcm2711-rpi-4-b.dtb
 enable_gic=1