diff --git a/packages/tools/bcm2835-userland/package.mk b/packages/tools/bcm2835-userland/package.mk
deleted file mode 100644
index 6197ab0444..0000000000
--- a/packages/tools/bcm2835-userland/package.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="bcm2835-userland"
-PKG_VERSION="cc1ca18fb0689b01cc2ca2aa4b400dcee624a213"
-PKG_SHA256="8a4bbfcd7181b2656b2781566c9e10eafdf6834399d2a0d2cf0c50923eec65f6"
-PKG_ARCH="arm aarch64"
-PKG_LICENSE="BSD-3-Clause"
-PKG_SITE="https://github.com/raspberrypi/userland"
-PKG_URL="https://github.com/raspberrypi/userland/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="gcc:host"
-PKG_LONGDESC="Source code for ARM side libraries for interfacing to Raspberry Pi GPU"
-PKG_TOOLCHAIN="cmake"
-
-if [ ${TARGET_ARCH} = "aarch64" ]; then
-  PKG_CMAKE_OPTS_TARGET="-DARM64=ON"
-else
-  PKG_CMAKE_OPTS_TARGET="-DARM64=OFF"
-fi
-
-makeinstall_target() {
-  # libraries used by below binaries
-  mkdir -p ${INSTALL}/usr/lib
-#    cp -PRv ${PKG_BUILD}/build/lib/libbcm_host.so ${INSTALL}/usr/lib
-#    cp -PRv ${PKG_BUILD}/build/lib/libdebug_sym.so ${INSTALL}/usr/lib
-    cp -PRv ${PKG_BUILD}/build/lib/libdtovl.so ${INSTALL}/usr/lib
-    cp -PRv ${PKG_BUILD}/build/lib/libvchiq_arm.so ${INSTALL}/usr/lib
-    cp -PRv ${PKG_BUILD}/build/lib/libvcos.so ${INSTALL}/usr/lib
-#    cp -PRv ${PKG_BUILD}/build/lib/libdebug_sym_static.a ${INSTALL}/usr/lib
-#    cp -PRv ${PKG_BUILD}/build/lib/libfdt.a ${INSTALL}/usr/lib
-#    cp -PRv ${PKG_BUILD}/build/lib/libvchostif.a ${INSTALL}/usr/lib
-
-  mkdir -p ${INSTALL}/usr/bin
-    cp -PRv ${PKG_BUILD}/build/bin/dtoverlay ${INSTALL}/usr/bin
-    ln -s dtoverlay                          ${INSTALL}/usr/bin/dtparam
-    cp -PRv ${PKG_BUILD}/build/bin/vcgencmd  ${INSTALL}/usr/bin
-    cp -PRv ${PKG_BUILD}/build/bin/vcmailbox ${INSTALL}/usr/bin
-# tvservice does nothing when using vc4 driver
-#    cp -PRv ${PKG_BUILD}/build/bin/tvservice ${INSTALL}/usr/bin
-}
diff --git a/packages/tools/bcm2835-utils/package.mk b/packages/tools/bcm2835-utils/package.mk
index 2fb3d3b083..3b107f3a1c 100644
--- a/packages/tools/bcm2835-utils/package.mk
+++ b/packages/tools/bcm2835-utils/package.mk
@@ -2,25 +2,21 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bcm2835-utils"
-PKG_VERSION="79ff2c449915c138fcdd1eaf268fe618594649f3"
-PKG_SHA256="7043ee3d1a53cfe02ee966f015db038bb5e489989c5d587e34fa9df4c850ae3a"
+PKG_VERSION="a8ff215188e1e993146f72aa8526e1a3b2324316"
+PKG_SHA256="f475e27fff4e4272930f11719286ffd4070226a7e0a883158a4df83a88e1cc31"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="BSD-3-Clause"
 PKG_SITE="https://github.com/raspberrypi/utils"
 PKG_URL="https://github.com/raspberrypi/utils/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="gcc:host"
+PKG_DEPENDS_TARGET="toolchain dtc"
 PKG_LONGDESC="Raspberry Pi related collection of scripts and simple applications"
 PKG_TOOLCHAIN="cmake"
 
-# only going to use vclog so don't build everything else
-make_target() {
-  mkdir -p ${PKG_BUILD}/.${TARGET_NAME}/vclog/build
-  cd ${PKG_BUILD}/.${TARGET_NAME}/vclog/build
-  cmake -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} -DCMAKE_C_FLAGS="${TARGET_CFLAGS}" -S ${PKG_BUILD}/vclog
-  make
-}
-
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
-  cp -PRv ${PKG_BUILD}/.${TARGET_NAME}/vclog/build/vclog ${INSTALL}/usr/bin
+  cp -PRv ${PKG_BUILD}/.${TARGET_NAME}/vclog/vclog ${INSTALL}/usr/bin
+  cp -PRv ${PKG_BUILD}/.${TARGET_NAME}/dtmerge/{dtoverlay,dtmerge,dtparam} ${INSTALL}/usr/bin
+  cp -PRv ${PKG_BUILD}/.${TARGET_NAME}/pinctrl/pinctrl ${INSTALL}/usr/bin
+  cp -PRv ${PKG_BUILD}/.${TARGET_NAME}/vcgencmd/vcgencmd ${INSTALL}/usr/bin
+  cp -PRv ${PKG_BUILD}/.${TARGET_NAME}/vcmailbox/vcmailbox ${INSTALL}/usr/bin
 }
diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
index 74b005f08e..09ec2e782d 100644
--- a/packages/tools/dtc/package.mk
+++ b/packages/tools/dtc/package.mk
@@ -44,4 +44,8 @@ makeinstall_target() {
     cp -P ${PKG_BUILD}/.${TARGET_NAME}/fdtget ${INSTALL}/usr/bin/
   mkdir -p ${INSTALL}/usr/lib
     cp -P ${PKG_BUILD}/.${TARGET_NAME}/libfdt/{libfdt.so,libfdt.so.1} ${INSTALL}/usr/lib/
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/libfdt/{libfdt.so,libfdt.so.1} ${SYSROOT_PREFIX}/usr/lib/
+  mkdir -p ${SYSROOT_PREFIX}/usr/include
+    cp -P ${PKG_BUILD}/.${TARGET_NAME}/libfdt/*.h ${SYSROOT_PREFIX}/usr/include/
 }
diff --git a/projects/RPi/options b/projects/RPi/options
index f4bb64220c..dbba3f22fd 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -89,7 +89,7 @@
     DRIVER_ADDONS="crazycat dvb-latest"
 
   # additional packages to install:
-    ADDITIONAL_PACKAGES+=" bcm2835-userland bcm2835-utils dtc"
+    ADDITIONAL_PACKAGES+=" bcm2835-utils dtc"
 
   # debug tty path
     DEBUG_TTY="/dev/console"