diff --git a/recipes-devtools/raspi-utils/raspi-utils_git.bb b/recipes-devtools/raspi-utils/raspi-utils_git.bb
index 8b979a4..77ff2c3 100644
--- a/recipes-devtools/raspi-utils/raspi-utils_git.bb
+++ b/recipes-devtools/raspi-utils/raspi-utils_git.bb
@@ -2,7 +2,12 @@ SUMMARY = "A collection of scripts and simple applications"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=4c01239e5c3a3d133858dedacdbca63c"
 
+RCONFLICTS:${PN} = "userland"
 DEPENDS:append = " dtc"
+PACKAGES =+ " ${PN}-raspinfo"
+PACKAGES =+ " ${PN}-ovmerge"
+RDEPENDS:${PN}-raspinfo += " bash"
+RDEPENDS:${PN}-ovmerge += " perl"
 
 PV = "1.0+git"
 
@@ -14,9 +19,35 @@ S = "${WORKDIR}/git"
 
 FILES:${PN}:append = " \
     ${datadir}/bash-completion/completions/pinctrl \
+    ${datadir}/bash-completion/completions/vcgencmd \
+"
+FILES:${PN}-raspinfo += "${bindir}/raspinfo"
+FILES:${PN}-ovmerge += "${bindir}/ovmerge"
+
+OECMAKE_TARGET_COMPILE = "\
+    dtmerge/all \
+    eeptools/all \
+    otpset/all \
+    overlaycheck/all \
+    ovmerge/all \
+    pinctrl/all \
+    raspinfo/all \
+    vcgencmd/all \
+    vclog/all \
+    vcmailbox/all \
 "
 
-OECMAKE_TARGET_COMPILE = "pinctrl/all dtmerge/all"
-OECMAKE_TARGET_INSTALL = "pinctrl/install dtmerge/install"
+OECMAKE_TARGET_INSTALL = "\
+    dtmerge/install \
+    eeptools/install \
+    otpset/install \
+    overlaycheck/install \
+    ovmerge/install \
+    pinctrl/install \
+    raspinfo/install \
+    vcgencmd/install \
+    vclog/install \
+    vcmailbox/install \
+"
 
 inherit cmake