diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 685eaf1bdc..5ec60bf294 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -275,12 +275,18 @@ makeinstall_target() {
 
     # install platform dtbs, but remove upstream kernel dtbs (i.e. without downstream
     # drivers and decent USB support) as these are not required by LibreELEC
-    cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb ${INSTALL}/usr/share/bootloader
+    for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do
+      if [ -f ${dtb} ]; then
+        cp -v ${dtb} ${INSTALL}/usr/share/bootloader
+      fi
+    done
     rm -f ${INSTALL}/usr/share/bootloader/bcm283*.dtb
+    # duplicated in overlays below
+    safe_remove ${INSTALL}/usr/share/bootloader/overlay_map.dtb
 
     # install overlay dtbs
-    for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/*.dtb \
-               arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/*.dtbo; do
+    for dtb in arch/arm/boot/dts/overlays/*.dtb \
+               arch/arm/boot/dts/overlays/*.dtbo; do
       cp ${dtb} ${INSTALL}/usr/share/bootloader/overlays 2>/dev/null || :
     done
     cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/README ${INSTALL}/usr/share/bootloader/overlays
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index 555b4c0aa0..940ddb18b4 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -5,7 +5,7 @@
 PKG_NAME="bcm2835-bootloader"
 PKG_VERSION="ba6259246c702b04ea56ff1034325e476d460ae8"
 PKG_SHA256="44fc5b364518cf41bdffc02bf159a8685641e2eaac2d220244ae39c19bbde120"
-PKG_ARCH="arm"
+PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"