diff --git a/package/hyperion/Config.in b/package/hyperion/Config.in
index bc5289650a5ea1caa0e904ee3fbcfb0923650ec6..ac3060ff4315a4fda14aab68b891f54f45605df8 100644
--- a/package/hyperion/Config.in
+++ b/package/hyperion/Config.in
@@ -7,8 +7,8 @@ config BR2_PACKAGE_HYPERION
 	depends on BR2_PACKAGE_QT5BASE
 	depends on BR2_PACKAGE_QT5BASE_WIDGETS
 	depends on BR2_PACKAGE_RPI_FIRMWARE
-	depends on BR2_PACKAGE_RPI_USERLAND
 	depends on BR2_PACKAGE_PROTOBUF
+	depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_RPI_USERLAND_TOOLS
 	help
 	  Hyperion is an open source ambient light software.
 	  https://github.com/hyperion-project/hyperion
diff --git a/package/hyperion/hyperion.mk b/package/hyperion/hyperion.mk
index 4010801640db3456edac60788d914ee8e0d14600..11ef9c357f6deba16b37214ae3e6a3f4b44b2a65 100644
--- a/package/hyperion/hyperion.mk
+++ b/package/hyperion/hyperion.mk
@@ -22,8 +22,16 @@ HYPERION_CONF_OPTS += -DBCM_INCLUDE_DIR="$(STAGING_DIR)/usr/" \
 	-DENABLE_QT5=ON \
 	--build "$(@D)/output/" "$(@D)/"
 
-HYPERION_DEPENDENCIES += rpi-firmware
-HYPERION_DEPENDENCIES += libusb qt5base host-libusb rpi-firmware rpi-userland host-protobuf host-cmake
+HYPERION_DEPENDENCIES += libusb qt5base host-libusb rpi-firmware host-protobuf host-cmake
+
+# rpi4
+ifeq ($(BR2_PACKAGE_RPI_USERLAND_TOOLS),y)
+HYPERION_DEPENDENCIES += rpi-userland-tools
+endif
+# rpi0, 1, 2 and 3
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+HYPERION_DEPENDENCIES += rpi-userland
+endif
 
 define HYPERION_PROTOBUF_COMPILE
 	mkdir -p "$(@D)/host-compile/"