diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass
index 35f15fe..9c1dfb4 100644
--- a/classes/cmake_plasma.bbclass
+++ b/classes/cmake_plasma.bbclass
@@ -1,42 +1,48 @@
 inherit cmake_qt5
 inherit gettext
 inherit python3native
 
 EXTRA_OECMAKE += " \
     -DBUILD_TESTING=OFF \
 "
 
 DEPENDS += " \
     extra-cmake-modules \
     qtbase \
 "
 
+do_configure_prepend() {
+    # kpackagetool5 needs to find installed service type files
+    export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
+}
+
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
     # meinproc5 needs to find its libraries
     export LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE}:$LD_LIBRARY_PATH
 }
 
 FILES_${PN} += " \
     ${libdir}/kconf_update_bin/* \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/*/*.so \
     ${libdir}/plugins/*/*/*.so \
     ${datadir}/config.kcfg/*.kcfg \
     ${datadir}/dbus-1/services/*.service \
     ${datadir}/dbus-1/system-services/*.service \
     ${datadir}/kconf_update/* \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservices5/*.desktop \
     ${datadir}/kservices5/*.protocol \
     ${datadir}/kservicetypes5/*.desktop \
+    ${datadir}/metainfo/*.xml \
     ${datadir}/polkit-1/actions/*.policy \
 "
 
 FILES_${PN}-dev += " \
     ${datadir}/dbus-1/interfaces/*.xml \
     ${datadir}/kdevappwizard/templates/*.tar.bz2 \
     ${libdir}/cmake/*/*.cmake \
     ${prefix}/mkspecs/modules/qt_*.pri \
 "
diff --git a/recipes-plasma/kde-cli-tools.inc b/recipes-plasma/kde-cli-tools.inc
new file mode 100644
index 0000000..e70317c
--- /dev/null
+++ b/recipes-plasma/kde-cli-tools.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "KDE Cli Tools"
+HOMEPAGE = ""
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+PR = "r0"
+
+DEPENDS = " \
+    qtsvg \
+    kconfig \
+    kdoctools \
+    kiconthemes \
+    kinit \
+    ki18n \
+    kcmutils \
+    kio \
+    kservice \
+    kwindowsystem \
+    kactivities \
+    kdesu \
+"
+
+SRC_URI = " \
+    git://anongit.kde.org/${BPN};nobranch=1 \
+"
+S = "${WORKDIR}/git"
+
+inherit cmake_plasma
+
+FILES_SOLIBSDEV = ""
+FILES_${PN} += " \
+    ${libdir}/libkdeinit5_*.so \
+"
diff --git a/recipes-plasma/kde-cli-tools_5.11.3.bb b/recipes-plasma/kde-cli-tools_5.11.3.bb
new file mode 100644
index 0000000..56169bb
--- /dev/null
+++ b/recipes-plasma/kde-cli-tools_5.11.3.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/recipes-plasma/packagegroups/plasma-mobile.bb b/recipes-plasma/packagegroups/plasma-mobile.bb
index 62391e2..b352d05 100644
--- a/recipes-plasma/packagegroups/plasma-mobile.bb
+++ b/recipes-plasma/packagegroups/plasma-mobile.bb
@@ -1,25 +1,26 @@
 DESCRIPTION = "KDE Plasma Mobile"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
     breeze \
     kactivitymanagerd \
+    kde-cli-tools \
     kdecoration \
     kscreenlocker \
     kwayland-integration \
     kwin \
     libkscreen \
     libksysguard \
     milou \
     plasma-integration \
     plasma-nm \
     plasma-pa \
     plasma-phone-components \
     plasma-workspace \
     polkit-kde-agent-1 \
     powerdevil \
     systemsettings \
 "