diff --git a/recipes-kf5/tier2/kpackage.inc b/recipes-kf5/tier2/kpackage.inc
index 3b7bf8b..6488789 100644
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -9,18 +9,14 @@ DEPENDS = " \
     qtbase \
     karchive \
     kcoreaddons \
-    ki18n \
     kpackage-native \
 "
 
-SRC_URI = "git://anongit.kde.org/kpackage;nobranch=1"
+SRC_URI = " \
+    git://anongit.kde.org/kpackage;nobranch=1 \
+    file://0001-kf5-host-tooling-support.diff \
+"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-inherit gettext
-inherit python3native
-
-sysroot_stage_all_append_class-target() {
-    mkdir -p ${SYSROOT_DESTDIR}${bindir}
-    cp ${STAGING_BINDIR_NATIVE}/kpackagetool5 ${SYSROOT_DESTDIR}/${bindir}
-}
+inherit ki18n
diff --git a/recipes-kf5/tier2/kpackage/0001-kf5-host-tooling-support.diff b/recipes-kf5/tier2/kpackage/0001-kf5-host-tooling-support.diff
new file mode 100644
index 0000000..939dd0d
--- /dev/null
+++ b/recipes-kf5/tier2/kpackage/0001-kf5-host-tooling-support.diff
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8cf8412..c2d9811 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,6 +123,11 @@ install(EXPORT KF5PackageTargets
+         FILE KF5PackageTargets.cmake
+         NAMESPACE KF5::
+         COMPONENT Devel)
++install(EXPORT KF5PackageToolsTargets
++        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
++        FILE KF5PackageToolsTargets.cmake
++        NAMESPACE KF5::
++        COMPONENT Devel)
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpackage_version.h
+         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
+diff --git a/KF5PackageConfig.cmake.in b/KF5PackageConfig.cmake.in
+index 0009c46..40c7dfe 100644
+--- a/KF5PackageConfig.cmake.in
++++ b/KF5PackageConfig.cmake.in
+@@ -3,6 +3,13 @@
+ # Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5PackageTargets.cmake")
++if (CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING)
++    find_file(KPACKAGE_TARGETSFILE KF5Package/KF5PackageToolsTargets.cmake PATHS ${KF5_HOST_TOOLING} ${CMAKE_CURRENT_LIST_DIR} NO_DEFAULT_PATH)
++    include("${KPACKAGE_TARGETSFILE}")
++else()
++    include("${CMAKE_CURRENT_LIST_DIR}/KF5PackageToolsTargets.cmake")
++endif()
++
+ @PACKAGE_INCLUDE_QCHTARGETS@
+ 
+ set(Package_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+diff --git a/src/kpackagetool/CMakeLists.txt b/src/kpackagetool/CMakeLists.txt
+index 58533f9..60e25dc 100644
+--- a/src/kpackagetool/CMakeLists.txt
++++ b/src/kpackagetool/CMakeLists.txt
+@@ -13,4 +13,4 @@ add_executable(KF5::kpackagetool5 ALIAS kpackagetool5)
+ target_link_libraries(kpackagetool5 KF5::Archive KF5::Package KF5::I18n KF5::CoreAddons)
+ ecm_mark_nongui_executable(kpackagetool5)
+ 
+-install(TARGETS kpackagetool5 EXPORT KF5PackageTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS kpackagetool5 EXPORT KF5PackageToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/recipes-kf5/tier3/kcmutils.inc b/recipes-kf5/tier3/kcmutils.inc
index 5b9264e..4f55155 100644
--- a/recipes-kf5/tier3/kcmutils.inc
+++ b/recipes-kf5/tier3/kcmutils.inc
@@ -17,6 +17,7 @@ DEPENDS = " \
     kxmlgui \
     kdeclarative \
     kpackage \
+    kpackage-native \
 "
 
 SRC_URI = "git://anongit.kde.org/kcmutils;nobranch=1"
diff --git a/recipes-kf5/tier3/kdeclarative.inc b/recipes-kf5/tier3/kdeclarative.inc
index 381d3de..2127eb8 100644
--- a/recipes-kf5/tier3/kdeclarative.inc
+++ b/recipes-kf5/tier3/kdeclarative.inc
@@ -17,6 +17,7 @@ DEPENDS = " \
     kglobalaccel \
     kguiaddons \
     kpackage \
+    kpackage-native \
     libepoxy \
 "
 
diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc
index 0b3f91f..9163628 100644
--- a/recipes-kf5/tier3/krunner.inc
+++ b/recipes-kf5/tier3/krunner.inc
@@ -15,6 +15,7 @@ DEPENDS = " \
     kauth-native \
     kservice \
     plasma-framework \
+    kpackage-native \
     solid \
     threadweaver \
 "
diff --git a/recipes-kf5/tier3/plasma-framework.inc b/recipes-kf5/tier3/plasma-framework.inc
index b380aff..e92794d 100644
--- a/recipes-kf5/tier3/plasma-framework.inc
+++ b/recipes-kf5/tier3/plasma-framework.inc
@@ -24,6 +24,7 @@ DEPENDS = " \
     kxmlgui \
     knotifications \
     kpackage \
+    kpackage-native \
     kwayland \
     kirigami \
 "
diff --git a/recipes-kf5/tier4/frameworkintegration.inc b/recipes-kf5/tier4/frameworkintegration.inc
index 4f8b7ce..e673e76 100644
--- a/recipes-kf5/tier4/frameworkintegration.inc
+++ b/recipes-kf5/tier4/frameworkintegration.inc
@@ -15,6 +15,7 @@ DEPENDS = " \
     knotifications \
     kwidgetsaddons \
     kpackage \
+    kpackage-native \
     knewstuff \
 "