diff --git a/recipes-kf5/obsolete/kdelibs4support.inc b/recipes-kf5/obsolete/kdelibs4support.inc
index 719d332..5819a38 100644
--- a/recipes-kf5/obsolete/kdelibs4support.inc
+++ b/recipes-kf5/obsolete/kdelibs4support.inc
@@ -20,6 +20,7 @@ DEPENDS = " \
     kparts \
     kunitconversion \
     liburi-perl-native \
+    openssl \
 "
 
 SRC_URI = " \
diff --git a/recipes-kf5/obsolete/kdelibs4support_5.41.0.bb b/recipes-kf5/obsolete/kdelibs4support_5.42.0.bb
similarity index 100%
rename from recipes-kf5/obsolete/kdelibs4support_5.41.0.bb
rename to recipes-kf5/obsolete/kdelibs4support_5.42.0.bb
diff --git a/recipes-kf5/obsolete/kjs_5.41.0.bb b/recipes-kf5/obsolete/kjs_5.42.0.bb
similarity index 100%
rename from recipes-kf5/obsolete/kjs_5.41.0.bb
rename to recipes-kf5/obsolete/kjs_5.42.0.bb
diff --git a/recipes-kf5/obsolete/kjsembed.inc b/recipes-kf5/obsolete/kjsembed.inc
index 20a1651..70c9d21 100644
--- a/recipes-kf5/obsolete/kjsembed.inc
+++ b/recipes-kf5/obsolete/kjsembed.inc
@@ -5,7 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
-DEPENDS = "qttools qtsvg kjs ki18n"
+DEPENDS = " \
+    qttools \
+    qtsvg \
+    kjs \
+    ki18n \
+"
 
 SRC_URI = " \
     git://anongit.kde.org/${PN};nobranch=1 \
diff --git a/recipes-kf5/obsolete/kjsembed/0001-optional-kdoctools.patch b/recipes-kf5/obsolete/kjsembed/0001-optional-kdoctools.patch
index eb2442b..89ecc9d 100644
--- a/recipes-kf5/obsolete/kjsembed/0001-optional-kdoctools.patch
+++ b/recipes-kf5/obsolete/kjsembed/0001-optional-kdoctools.patch
@@ -1,4 +1,4 @@
-commit d8bc800380613a147d4db2df696e44b816375a38
+commit e05540ab38a070085cc33725aabba56a6ea77369
 Author: Volker Krause <vkrause@kde.org>
 Date:   Mon Jan 1 14:18:52 2018 +0100
 
@@ -13,7 +13,7 @@ Date:   Mon Jan 1 14:18:52 2018 +0100
     Differential Revision: https://phabricator.kde.org/D9588
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c826d01..8158d31 100644
+index f23b786..3d365b6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -29,7 +29,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KJSEMBED
@@ -25,14 +25,19 @@ index c826d01..8158d31 100644
  
  add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
  remove_definitions(-DQT_NO_CAST_FROM_ASCII)
-@@ -40,7 +40,9 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+@@ -38,9 +38,13 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
+ add_definitions(-DTRANSLATION_DOMAIN=\"kjsembed5\")
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
      ki18n_install(po)
-     kdoctools_install(po)
- endif()
--add_subdirectory(docs)
+-    kdoctools_install(po)
++    if (KF5DocTools_FOUND)
++        kdoctools_install(po)
++    endif()
++endif()
 +if(KF5DocTools_FOUND)
 +    add_subdirectory(docs)
-+endif()
+ endif()
+-add_subdirectory(docs)
  add_subdirectory(src)
  add_subdirectory(examples/kjsconsole)
  
diff --git a/recipes-kf5/obsolete/kjsembed_5.41.0.bb b/recipes-kf5/obsolete/kjsembed_5.41.0.bb
deleted file mode 100644
index e022d66..0000000
--- a/recipes-kf5/obsolete/kjsembed_5.41.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require ${PN}.inc
-# SRCREV = "v${PV}"
-SRCREV = "master"
diff --git a/recipes-kf5/tier1/attica_5.41.0.bb b/recipes-kf5/obsolete/kjsembed_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/attica_5.41.0.bb
rename to recipes-kf5/obsolete/kjsembed_5.42.0.bb
diff --git a/recipes-kf5/tier1/bluez-qt_5.41.0.bb b/recipes-kf5/tier1/attica_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/bluez-qt_5.41.0.bb
rename to recipes-kf5/tier1/attica_5.42.0.bb
diff --git a/recipes-kf5/tier1/breeze-icons_5.41.0.bb b/recipes-kf5/tier1/bluez-qt_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/breeze-icons_5.41.0.bb
rename to recipes-kf5/tier1/bluez-qt_5.42.0.bb
diff --git a/recipes-kf5/tier1/extra-cmake-modules_5.41.0.bb b/recipes-kf5/tier1/breeze-icons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/extra-cmake-modules_5.41.0.bb
rename to recipes-kf5/tier1/breeze-icons_5.42.0.bb
diff --git a/recipes-kf5/tier1/karchive_5.41.0.bb b/recipes-kf5/tier1/extra-cmake-modules_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/karchive_5.41.0.bb
rename to recipes-kf5/tier1/extra-cmake-modules_5.42.0.bb
diff --git a/recipes-kf5/tier1/kcodecs_5.41.0.bb b/recipes-kf5/tier1/karchive_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kcodecs_5.41.0.bb
rename to recipes-kf5/tier1/karchive_5.42.0.bb
diff --git a/recipes-kf5/tier1/kconfig_5.41.0.bb b/recipes-kf5/tier1/kcodecs_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kconfig_5.41.0.bb
rename to recipes-kf5/tier1/kcodecs_5.42.0.bb
diff --git a/recipes-kf5/tier1/kcoreaddons_5.41.0.bb b/recipes-kf5/tier1/kconfig_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kcoreaddons_5.41.0.bb
rename to recipes-kf5/tier1/kconfig_5.42.0.bb
diff --git a/recipes-kf5/tier1/kdbusaddons_5.41.0.bb b/recipes-kf5/tier1/kcoreaddons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kdbusaddons_5.41.0.bb
rename to recipes-kf5/tier1/kcoreaddons_5.42.0.bb
diff --git a/recipes-kf5/tier1/kdbusaddons.inc b/recipes-kf5/tier1/kdbusaddons.inc
index e5af6c5..e12c9d7 100644
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -11,3 +11,7 @@ SRC_URI = "git://anongit.kde.org/kdbusaddons;nobranch=1"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
+
+FILES_${PN}-dev += " \
+    ${libdir}/cmake/KF5DBusAddons \
+"
diff --git a/recipes-kf5/tier1/kdnssd_5.41.0.bb b/recipes-kf5/tier1/kdbusaddons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kdnssd_5.41.0.bb
rename to recipes-kf5/tier1/kdbusaddons_5.42.0.bb
diff --git a/recipes-kf5/tier1/kguiaddons_5.41.0.bb b/recipes-kf5/tier1/kdnssd_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kguiaddons_5.41.0.bb
rename to recipes-kf5/tier1/kdnssd_5.42.0.bb
diff --git a/recipes-kf5/tier1/ki18n_5.41.0.bb b/recipes-kf5/tier1/kguiaddons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/ki18n_5.41.0.bb
rename to recipes-kf5/tier1/kguiaddons_5.42.0.bb
diff --git a/recipes-kf5/tier1/kidletime_5.41.0.bb b/recipes-kf5/tier1/ki18n_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kidletime_5.41.0.bb
rename to recipes-kf5/tier1/ki18n_5.42.0.bb
diff --git a/recipes-kf5/tier1/kimageformats_5.41.0.bb b/recipes-kf5/tier1/kidletime_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kimageformats_5.41.0.bb
rename to recipes-kf5/tier1/kidletime_5.42.0.bb
diff --git a/recipes-kf5/tier1/kirigami_5.41.0.bb b/recipes-kf5/tier1/kimageformats_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kirigami_5.41.0.bb
rename to recipes-kf5/tier1/kimageformats_5.42.0.bb
diff --git a/recipes-kf5/tier1/kirigami.inc b/recipes-kf5/tier1/kirigami.inc
index e37f46d..46efef2 100644
--- a/recipes-kf5/tier1/kirigami.inc
+++ b/recipes-kf5/tier1/kirigami.inc
@@ -12,13 +12,7 @@ S = "${WORKDIR}/git"
 inherit cmake_kf5
 
 FILES_${PN} += " \
-    ${libdir}/qml/org/kde/kirigami.2/* \
-    ${libdir}/qml/org/kde/kirigami.2/styles/org.kde.desktop.plasma/* \
-    ${libdir}/qml/org/kde/kirigami.2/styles/Plasma/* \
-    ${libdir}/qml/org/kde/kirigami.2/styles/Material/* \
-    ${libdir}/qml/org/kde/kirigami.2/private/* \
-    ${libdir}/qml/org/kde/kirigami.2/templates/* \
-    ${libdir}/qml/org/kde/kirigami.2/templates/private/* \
+    ${libdir}/qml/org/kde/kirigami.2 \
 "
 
 RDEPENDS_${PN} += " \
diff --git a/recipes-kf5/tier1/kitemmodels_5.41.0.bb b/recipes-kf5/tier1/kirigami_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kitemmodels_5.41.0.bb
rename to recipes-kf5/tier1/kirigami_5.42.0.bb
diff --git a/recipes-kf5/tier1/kitemviews_5.41.0.bb b/recipes-kf5/tier1/kitemmodels_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kitemviews_5.41.0.bb
rename to recipes-kf5/tier1/kitemmodels_5.42.0.bb
diff --git a/recipes-kf5/tier1/kplotting_5.41.0.bb b/recipes-kf5/tier1/kitemviews_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kplotting_5.41.0.bb
rename to recipes-kf5/tier1/kitemviews_5.42.0.bb
diff --git a/recipes-kf5/tier1/ksyntaxhighlighting_5.41.0.bb b/recipes-kf5/tier1/kplotting_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/ksyntaxhighlighting_5.41.0.bb
rename to recipes-kf5/tier1/kplotting_5.42.0.bb
diff --git a/recipes-kf5/tier1/kwayland_5.41.0.bb b/recipes-kf5/tier1/ksyntaxhighlighting_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kwayland_5.41.0.bb
rename to recipes-kf5/tier1/ksyntaxhighlighting_5.42.0.bb
diff --git a/recipes-kf5/tier1/kwidgetsaddons_5.41.0.bb b/recipes-kf5/tier1/kwayland_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kwidgetsaddons_5.41.0.bb
rename to recipes-kf5/tier1/kwayland_5.42.0.bb
diff --git a/recipes-kf5/tier1/kwindowsystem_5.41.0.bb b/recipes-kf5/tier1/kwidgetsaddons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/kwindowsystem_5.41.0.bb
rename to recipes-kf5/tier1/kwidgetsaddons_5.42.0.bb
diff --git a/recipes-kf5/tier1/modemmanager-qt_5.41.0.bb b/recipes-kf5/tier1/kwindowsystem_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/modemmanager-qt_5.41.0.bb
rename to recipes-kf5/tier1/kwindowsystem_5.42.0.bb
diff --git a/recipes-kf5/tier1/networkmanager-qt_5.41.0.bb b/recipes-kf5/tier1/modemmanager-qt_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/networkmanager-qt_5.41.0.bb
rename to recipes-kf5/tier1/modemmanager-qt_5.42.0.bb
diff --git a/recipes-kf5/tier1/oxygen-icons_5.41.0.bb b/recipes-kf5/tier1/networkmanager-qt_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/oxygen-icons_5.41.0.bb
rename to recipes-kf5/tier1/networkmanager-qt_5.42.0.bb
diff --git a/recipes-kf5/tier1/prison_5.41.0.bb b/recipes-kf5/tier1/oxygen-icons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/prison_5.41.0.bb
rename to recipes-kf5/tier1/oxygen-icons_5.42.0.bb
diff --git a/recipes-kf5/tier1/solid_5.41.0.bb b/recipes-kf5/tier1/prison_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/solid_5.41.0.bb
rename to recipes-kf5/tier1/prison_5.42.0.bb
diff --git a/recipes-kf5/tier1/sonnet_5.41.0.bb b/recipes-kf5/tier1/solid_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/sonnet_5.41.0.bb
rename to recipes-kf5/tier1/solid_5.42.0.bb
diff --git a/recipes-kf5/tier1/sonnet.inc b/recipes-kf5/tier1/sonnet.inc
index 005f64b..d182512 100644
--- a/recipes-kf5/tier1/sonnet.inc
+++ b/recipes-kf5/tier1/sonnet.inc
@@ -7,14 +7,15 @@ PR = "r0"
 
 DEPENDS = "qtbase sonnet-native"
 
-SRC_URI = "git://anongit.kde.org/sonnet;nobranch=1 \
-    file://0002-unexport-helpers.patch \
+SRC_URI = " \
+    git://anongit.kde.org/sonnet;nobranch=1 \
+    file://0001-no-autotests.diff \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
-EXTRA_OECMAKE_class-native += " -DSONNET_USE_WIDGETS=OFF"
-EXTRA_OECMAKE_class-target += " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/parsetrigrams"
+EXTRA_OECMAKE_append_class-native += " -DSONNET_USE_WIDGETS=OFF"
+EXTRA_OECMAKE_append_class-target += " -DPARSETRIGRAMS_EXECUTABLE=${STAGING_DIR_NATIVE}/${bindir}/parsetrigrams"
 
 FILES_${PN} += " \
     ${datadir}/kf5/sonnet/* \
diff --git a/recipes-kf5/tier1/sonnet/0001-no-autotests.diff b/recipes-kf5/tier1/sonnet/0001-no-autotests.diff
new file mode 100644
index 0000000..76a0dbd
--- /dev/null
+++ b/recipes-kf5/tier1/sonnet/0001-no-autotests.diff
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74f1a2f..b52c833 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,9 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+ endif()
+ 
+ add_subdirectory(src)
+-add_subdirectory(autotests)
++if (BUILD_TESTING)
++     add_subdirectory(autotests)
++endif()
+ if (NOT CMAKE_CROSSCOMPILING)
+ 	add_subdirectory(data)
+ endif()
diff --git a/recipes-kf5/tier1/sonnet/0002-unexport-helpers.patch b/recipes-kf5/tier1/sonnet/0002-unexport-helpers.patch
deleted file mode 100644
index 4e8e75b..0000000
--- a/recipes-kf5/tier1/sonnet/0002-unexport-helpers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4104b2ea0db4d65d0cb2fcac6db9e343df5f2d9b
-Author: Volker Krause <vkrause@kde.org>
-Date:   Sun Jul 30 21:37:48 2017 +0200
-
-    Don't export internal helper executables
-    
-    Summary:
-    Exporting the executables will make the cmake config file check for their
-    presence when used, which isn't really necessary, and is actually a problem
-    for cross-compilation, where the helper executables don't exist for the
-    target but for the host.
-    
-    Reviewers: #frameworks, cordlandwehr
-    
-    Tags: #frameworks
-    
-    Differential Revision: https://phabricator.kde.org/D7008
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 100b05f..d86cde1 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -11,8 +11,8 @@ ecm_mark_nongui_executable(gentrigrams)
- 
- TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core)
- TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore)
--INSTALL(TARGETS parsetrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
--INSTALL(TARGETS gentrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-+INSTALL(TARGETS parsetrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-+INSTALL(TARGETS gentrigrams ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
- 
- cmake_policy(SET CMP0026 OLD) # FIXME: make this work with CMP0026 set to NEW
- if(CMAKE_CROSSCOMPILING AND PARSETRIGRAMS_EXECUTABLE)
diff --git a/recipes-kf5/tier1/threadweaver_5.41.0.bb b/recipes-kf5/tier1/sonnet_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier1/threadweaver_5.41.0.bb
rename to recipes-kf5/tier1/sonnet_5.42.0.bb
diff --git a/recipes-kf5/tier2/kactivities_5.41.0.bb b/recipes-kf5/tier1/threadweaver_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kactivities_5.41.0.bb
rename to recipes-kf5/tier1/threadweaver_5.42.0.bb
diff --git a/recipes-kf5/tier2/kauth_5.41.0.bb b/recipes-kf5/tier2/kactivities_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kauth_5.41.0.bb
rename to recipes-kf5/tier2/kactivities_5.42.0.bb
diff --git a/recipes-kf5/tier2/kcompletion_5.41.0.bb b/recipes-kf5/tier2/kauth_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kcompletion_5.41.0.bb
rename to recipes-kf5/tier2/kauth_5.42.0.bb
diff --git a/recipes-kf5/tier2/kcrash_5.41.0.bb b/recipes-kf5/tier2/kcompletion_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kcrash_5.41.0.bb
rename to recipes-kf5/tier2/kcompletion_5.42.0.bb
diff --git a/recipes-kf5/tier2/kcrash.inc b/recipes-kf5/tier2/kcrash.inc
index d17164e..303bee0 100644
--- a/recipes-kf5/tier2/kcrash.inc
+++ b/recipes-kf5/tier2/kcrash.inc
@@ -9,7 +9,6 @@ DEPENDS = "kcoreaddons kwindowsystem"
 
 SRC_URI = " \
     git://anongit.kde.org/kcrash;nobranch=1 \
-    file://0001-no-x11.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kf5/tier2/kcrash/0001-no-x11.patch b/recipes-kf5/tier2/kcrash/0001-no-x11.patch
deleted file mode 100644
index bd1495c..0000000
--- a/recipes-kf5/tier2/kcrash/0001-no-x11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit 7974f8ddbe9f9594abcf9aac951138c636d79a2a
-Author: Volker Krause <vkrause@kde.org>
-Date:   Sun Jul 30 15:02:48 2017 +0200
-
-    Fix build on Linux without X11
-    
-    Reviewers: #frameworks
-    
-    Tags: #frameworks
-    
-    Differential Revision: https://phabricator.kde.org/D6992
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 82220d6..76f4b8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,10 +19,11 @@ include(KDECMakeSettings)
- 
- if (NOT APPLE)
-     find_package(X11)
-+    find_package(Wayland)
- endif()
- 
- set(HAVE_X11 ${X11_FOUND})
--
-+set(HAVE_WAYLAND ${Wayland_FOUND})
- 
- include(GenerateExportHeader)
- include(ECMSetupVersion)
-diff --git a/src/config-kcrash.h.cmake b/src/config-kcrash.h.cmake
-index fa032a3..1d92bec 100644
---- a/src/config-kcrash.h.cmake
-+++ b/src/config-kcrash.h.cmake
-@@ -1,4 +1,5 @@
- #cmakedefine01 HAVE_X11
-+#cmakedefine01 HAVE_WAYLAND
- #cmakedefine KCRASH_CORE_PATTERN_RAISE
- 
- #define kde_socklen_t socklen_t
-diff --git a/src/kcrash.cpp b/src/kcrash.cpp
-index 830a036..778cd4f 100644
---- a/src/kcrash.cpp
-+++ b/src/kcrash.cpp
-@@ -265,6 +265,8 @@ static const char* displayEnvVarName_c()
-     // Can't use QGuiApplication::platformName() here, there is no app instance.
- #if HAVE_X11
-     return "DISPLAY";
-+#elif HAVE_WAYLAND
-+    return "WAYLAND_DISPLAY";
- #elif defined(Q_OS_OSX)
-     return "MAC_DISPLAY";
- #elif defined(Q_OS_WIN)
diff --git a/recipes-kf5/tier2/kdoctools_5.41.0.bb b/recipes-kf5/tier2/kcrash_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kdoctools_5.41.0.bb
rename to recipes-kf5/tier2/kcrash_5.42.0.bb
diff --git a/recipes-kf5/tier2/kfilemetadata_5.41.0.bb b/recipes-kf5/tier2/kdoctools_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kfilemetadata_5.41.0.bb
rename to recipes-kf5/tier2/kdoctools_5.42.0.bb
diff --git a/recipes-kf5/tier2/kjobwidgets_5.41.0.bb b/recipes-kf5/tier2/kfilemetadata_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kjobwidgets_5.41.0.bb
rename to recipes-kf5/tier2/kfilemetadata_5.42.0.bb
diff --git a/recipes-kf5/tier2/knotifications_5.41.0.bb b/recipes-kf5/tier2/kjobwidgets_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/knotifications_5.41.0.bb
rename to recipes-kf5/tier2/kjobwidgets_5.42.0.bb
diff --git a/recipes-kf5/tier2/kpackage_5.41.0.bb b/recipes-kf5/tier2/knotifications_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kpackage_5.41.0.bb
rename to recipes-kf5/tier2/knotifications_5.42.0.bb
diff --git a/recipes-kf5/tier2/kpackage.inc b/recipes-kf5/tier2/kpackage.inc
index a6310fe..3b7bf8b 100644
--- a/recipes-kf5/tier2/kpackage.inc
+++ b/recipes-kf5/tier2/kpackage.inc
@@ -5,7 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
-DEPENDS = "qtbase karchive kcoreaddons ki18n"
+DEPENDS = " \
+    qtbase \
+    karchive \
+    kcoreaddons \
+    ki18n \
+    kpackage-native \
+"
 
 SRC_URI = "git://anongit.kde.org/kpackage;nobranch=1"
 S = "${WORKDIR}/git"
@@ -15,6 +21,6 @@ inherit gettext
 inherit python3native
 
 sysroot_stage_all_append_class-target() {
-    mkdir -p ${SYSROOT_DESTDIR}/${bindir}
-    cp ${D}${bindir}//kpackagetool5 ${SYSROOT_DESTDIR}/${bindir}/
+    mkdir -p ${SYSROOT_DESTDIR}${bindir}
+    cp ${STAGING_BINDIR_NATIVE}/kpackagetool5 ${SYSROOT_DESTDIR}/${bindir}
 }
diff --git a/recipes-kf5/tier2/kpty_5.41.0.bb b/recipes-kf5/tier2/kpackage_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kpty_5.41.0.bb
rename to recipes-kf5/tier2/kpackage_5.42.0.bb
diff --git a/recipes-kf5/tier2/kunitconversion_5.41.0.bb b/recipes-kf5/tier2/kpty_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier2/kunitconversion_5.41.0.bb
rename to recipes-kf5/tier2/kpty_5.42.0.bb
diff --git a/recipes-kf5/tier3/baloo_5.41.0.bb b/recipes-kf5/tier2/kunitconversion_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/baloo_5.41.0.bb
rename to recipes-kf5/tier2/kunitconversion_5.42.0.bb
diff --git a/recipes-kf5/tier3/kactivitiesstats_5.41.0.bb b/recipes-kf5/tier3/baloo_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kactivitiesstats_5.41.0.bb
rename to recipes-kf5/tier3/baloo_5.42.0.bb
diff --git a/recipes-kf5/tier3/kbookmarks_5.41.0.bb b/recipes-kf5/tier3/kactivitiesstats_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kbookmarks_5.41.0.bb
rename to recipes-kf5/tier3/kactivitiesstats_5.42.0.bb
diff --git a/recipes-kf5/tier3/kcmutils_5.41.0.bb b/recipes-kf5/tier3/kbookmarks_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kcmutils_5.41.0.bb
rename to recipes-kf5/tier3/kbookmarks_5.42.0.bb
diff --git a/recipes-kf5/tier3/kconfigwidgets_5.41.0.bb b/recipes-kf5/tier3/kcmutils_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kconfigwidgets_5.41.0.bb
rename to recipes-kf5/tier3/kcmutils_5.42.0.bb
diff --git a/recipes-kf5/tier3/kdeclarative_5.41.0.bb b/recipes-kf5/tier3/kconfigwidgets_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kdeclarative_5.41.0.bb
rename to recipes-kf5/tier3/kconfigwidgets_5.42.0.bb
diff --git a/recipes-kf5/tier3/kdeclarative.inc b/recipes-kf5/tier3/kdeclarative.inc
index f7d259e..50b0de4 100644
--- a/recipes-kf5/tier3/kdeclarative.inc
+++ b/recipes-kf5/tier3/kdeclarative.inc
@@ -27,12 +27,5 @@ inherit gettext
 inherit python3native
 
 FILES_${PN} += " \
-    ${libdir}/qml/org/kde/kquickcontrols/* \
-    ${libdir}/qml/org/kde/kquickcontrolsaddons/* \
-    ${libdir}/qml/org/kde/kio/* \
-    ${libdir}/qml/org/kde/private/kquickcontrols/* \
-    ${libdir}/qml/org/kde/kconfig/* \
-    ${libdir}/qml/org/kde/kcoreaddons/* \
-    ${libdir}/qml/org/kde/draganddrop/* \
-    ${libdir}/qml/org/kde/kwindowsystem/* \
+    ${libdir}/qml/org/kde \
 "
diff --git a/recipes-kf5/tier3/kded_5.41.0.bb b/recipes-kf5/tier3/kdeclarative_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kded_5.41.0.bb
rename to recipes-kf5/tier3/kdeclarative_5.42.0.bb
diff --git a/recipes-kf5/tier3/kdesignerplugin_5.41.0.bb b/recipes-kf5/tier3/kded_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kdesignerplugin_5.41.0.bb
rename to recipes-kf5/tier3/kded_5.42.0.bb
diff --git a/recipes-kf5/tier3/kdesu_5.41.0.bb b/recipes-kf5/tier3/kdesignerplugin_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kdesu_5.41.0.bb
rename to recipes-kf5/tier3/kdesignerplugin_5.42.0.bb
diff --git a/recipes-kf5/tier3/kemoticons_5.41.0.bb b/recipes-kf5/tier3/kdesu_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kemoticons_5.41.0.bb
rename to recipes-kf5/tier3/kdesu_5.42.0.bb
diff --git a/recipes-kf5/tier3/kglobalaccel_5.41.0.bb b/recipes-kf5/tier3/kemoticons_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kglobalaccel_5.41.0.bb
rename to recipes-kf5/tier3/kemoticons_5.42.0.bb
diff --git a/recipes-kf5/tier3/kiconthemes_5.41.0.bb b/recipes-kf5/tier3/kglobalaccel_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kiconthemes_5.41.0.bb
rename to recipes-kf5/tier3/kglobalaccel_5.42.0.bb
diff --git a/recipes-kf5/tier3/kinit_5.41.0.bb b/recipes-kf5/tier3/kiconthemes_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kinit_5.41.0.bb
rename to recipes-kf5/tier3/kiconthemes_5.42.0.bb
diff --git a/recipes-kf5/tier3/kio_5.41.0.bb b/recipes-kf5/tier3/kinit_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kio_5.41.0.bb
rename to recipes-kf5/tier3/kinit_5.42.0.bb
diff --git a/recipes-kf5/tier3/kio.inc b/recipes-kf5/tier3/kio.inc
index f56b556..6d64a5f 100644
--- a/recipes-kf5/tier3/kio.inc
+++ b/recipes-kf5/tier3/kio.inc
@@ -40,3 +40,7 @@ FILES_${PN} += " \
     ${datadir}/kservices5/searchproviders/*.desktop \
     ${datadir}/kf5/kcookiejar/domain_info \
 "
+
+RDEPENDS_${PN} += " \
+    ca-certificates \
+"
diff --git a/recipes-kf5/tier3/knewstuff_5.41.0.bb b/recipes-kf5/tier3/kio_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/knewstuff_5.41.0.bb
rename to recipes-kf5/tier3/kio_5.42.0.bb
diff --git a/recipes-kf5/tier3/knotifyconfig_5.41.0.bb b/recipes-kf5/tier3/knewstuff_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/knotifyconfig_5.41.0.bb
rename to recipes-kf5/tier3/knewstuff_5.42.0.bb
diff --git a/recipes-kf5/tier3/kparts_5.41.0.bb b/recipes-kf5/tier3/knotifyconfig_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kparts_5.41.0.bb
rename to recipes-kf5/tier3/knotifyconfig_5.42.0.bb
diff --git a/recipes-kf5/tier3/kpeople_5.41.0.bb b/recipes-kf5/tier3/kparts_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kpeople_5.41.0.bb
rename to recipes-kf5/tier3/kparts_5.42.0.bb
diff --git a/recipes-kf5/tier3/krunner_5.41.0.bb b/recipes-kf5/tier3/kpeople_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/krunner_5.41.0.bb
rename to recipes-kf5/tier3/kpeople_5.42.0.bb
diff --git a/recipes-kf5/tier3/kservice_5.41.0.bb b/recipes-kf5/tier3/krunner_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kservice_5.41.0.bb
rename to recipes-kf5/tier3/krunner_5.42.0.bb
diff --git a/recipes-kf5/tier3/ktexteditor_5.41.0.bb b/recipes-kf5/tier3/kservice_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/ktexteditor_5.41.0.bb
rename to recipes-kf5/tier3/kservice_5.42.0.bb
diff --git a/recipes-kf5/tier3/ktextwidgets_5.41.0.bb b/recipes-kf5/tier3/ktexteditor_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/ktextwidgets_5.41.0.bb
rename to recipes-kf5/tier3/ktexteditor_5.42.0.bb
diff --git a/recipes-kf5/tier3/kwallet_5.41.0.bb b/recipes-kf5/tier3/ktextwidgets_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kwallet_5.41.0.bb
rename to recipes-kf5/tier3/ktextwidgets_5.42.0.bb
diff --git a/recipes-kf5/tier3/kxmlgui_5.41.0.bb b/recipes-kf5/tier3/kwallet_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kxmlgui_5.41.0.bb
rename to recipes-kf5/tier3/kwallet_5.42.0.bb
diff --git a/recipes-kf5/tier3/kxmlrpcclient_5.41.0.bb b/recipes-kf5/tier3/kxmlgui_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/kxmlrpcclient_5.41.0.bb
rename to recipes-kf5/tier3/kxmlgui_5.42.0.bb
diff --git a/recipes-kf5/tier3/plasma-framework_5.41.0.bb b/recipes-kf5/tier3/kxmlrpcclient_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/plasma-framework_5.41.0.bb
rename to recipes-kf5/tier3/kxmlrpcclient_5.42.0.bb
diff --git a/recipes-kf5/tier3/plasma-framework.inc b/recipes-kf5/tier3/plasma-framework.inc
index 035946b..ba9982b 100644
--- a/recipes-kf5/tier3/plasma-framework.inc
+++ b/recipes-kf5/tier3/plasma-framework.inc
@@ -23,6 +23,7 @@ DEPENDS = " \
     knotifications \
     kpackage \
     kwayland \
+    kirigami \
 "
 
 SRC_URI = " \
@@ -39,18 +40,10 @@ FILES_${PN} += " \
     ${libdir}/plugins/kpackage/packagestructure/*.so \
     ${libdir}/plugins/plasma/scriptengines/*.so \
     ${libdir}/qml/org/kde/plasma/accessdenied/* \
-    ${libdir}/qml/org/kde/plasma/components.3/* \
-    ${libdir}/qml/org/kde/plasma/extras/* \
-    ${libdir}/qml/org/kde/plasma/extras/animations/* \
-    ${libdir}/qml/org/kde/plasma/components/* \
-    ${libdir}/qml/org/kde/plasma/components/private/* \
-    ${libdir}/qml/org/kde/plasma/core/* \
-    ${libdir}/qml/org/kde/plasma/core/private/* \
-    ${libdir}/qml/org/kde/plasma/calendar/* \
-    ${libdir}/qml/org/kde/plasma/platformcomponents/* \
-    ${libdir}/qml/QtQuick/Controls.2/Plasma/* \
-    ${libdir}/qml/QtQuick/Controls.2/Plasma/private/* \
-    ${libdir}/qml/QtQuick/Controls/Styles/Plasma/* \
+    ${libdir}/qml/org/kde/plasma  \
+    ${libdir}/qml/org/kde/kirigami.2 \
+    ${libdir}/qml/QtQuick/Controls.2/Plasma \
+    ${libdir}/qml/QtQuick/Controls/Styles/Plasma \
     ${datadir}/plasma/services/*.operations \
     ${datadir}/plasma/desktoptheme/air/* \
     ${datadir}/plasma/desktoptheme/air/*/* \
diff --git a/recipes-kf5/tier3/qqc2-desktop-style_5.41.0.bb b/recipes-kf5/tier3/plasma-framework_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier3/qqc2-desktop-style_5.41.0.bb
rename to recipes-kf5/tier3/plasma-framework_5.42.0.bb
diff --git a/recipes-kf5/tier4/frameworkintegration_5.41.0.bb b/recipes-kf5/tier3/qqc2-desktop-style_5.42.0.bb
similarity index 100%
rename from recipes-kf5/tier4/frameworkintegration_5.41.0.bb
rename to recipes-kf5/tier3/qqc2-desktop-style_5.42.0.bb
diff --git a/recipes-kf5/tier4/frameworkintegration_5.42.0.bb b/recipes-kf5/tier4/frameworkintegration_5.42.0.bb
new file mode 100644
index 0000000..56169bb
--- /dev/null
+++ b/recipes-kf5/tier4/frameworkintegration_5.42.0.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+SRCREV = "v${PV}"
diff --git a/scripts/kf5-release.sh b/scripts/kf5-release.sh
index c4922cd..73a8050 100755
--- a/scripts/kf5-release.sh
+++ b/scripts/kf5-release.sh
@@ -27,7 +27,7 @@ add)
     ;;
 remove)
     for recipe in `find $base -name "*_$version.bb"`; do
-        git rm $recipe
+        git rm -f $recipe
     done
     ;;
 *)