diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index ce913ea..af63197 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -1,23 +1,24 @@
 inherit cmake_qt5
 
 EXTRA_OECMAKE += " \
     -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
     -DKF5_HOST_TOOLING=${STAGING_DIR_NATIVE}/usr/lib/cmake \
+    -DBUILD_TESTING=OFF \
 "
 
 DEPENDS += "ecm"
 
 # FIXME: using tags gives us translations, translations require lrelease/lconvert host tools, the ecm recipe can't deal with that yet...
 do_configure_prepend() {
     rm -rf ${S}/po
 }
 
 # This function is rather offensive right now, but it seems to work
 do_install_prepend() {
     if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then
         sed -i 's/\"\/usr\//\"\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
         sed -i 's/\;\/usr\//\;\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
     fi
 }
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-kf5/tier1/kconfig.inc b/recipes-kf5/tier1/kconfig.inc
new file mode 100644
index 0000000..b1a165f
--- /dev/null
+++ b/recipes-kf5/tier1/kconfig.inc
@@ -0,0 +1,21 @@
+# requires session management support in QtGui
+# eg. via PACKAGECONFIG_append_pn-qtbase = "sm" in local.conf
+
+DESCRIPTION = "KConfig"
+HOMEPAGE = "https://api.kde.org/frameworks/kconfig/html/index.html"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    "
+PR = "r0"
+
+DEPENDS = "qtbase"
+
+SRC_URI = "git://anongit.kde.org/kconfig;nobranch=1"
+S = "${WORKDIR}/git"
+
+inherit cmake_kf5
+
+FILES_${PN}-dev += " \
+    ${libdir}/cmake/KF5Config/*.cmake \
+    ${prefix}/mkspecs/modules/qt_KConfig*.pri \
+"
diff --git a/recipes-kf5/tier1/kconfig_5.36.0.bb b/recipes-kf5/tier1/kconfig_5.36.0.bb
new file mode 100644
index 0000000..56169bb
--- /dev/null
+++ b/recipes-kf5/tier1/kconfig_5.36.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"