diff --git a/classes/cmake_plasma.bbclass b/classes/cmake_plasma.bbclass
index 7e6aa80..6b3f9dd 100644
--- a/classes/cmake_plasma.bbclass
+++ b/classes/cmake_plasma.bbclass
@@ -1,50 +1,51 @@
 inherit cmake_qt5
 inherit ki18n
 inherit kcoreaddons
 inherit kconfig
 inherit kauth
 inherit kdoctools
 
 EXTRA_OECMAKE += " \
     -DBUILD_TESTING=OFF \
 "
 
 DEPENDS += " \
     extra-cmake-modules \
     qtbase \
     kpackage-native \
 "
 
 do_configure_prepend() {
     # kpackagetool5 needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
 FILES_${PN} += " \
     ${libdir}/libkdeinit5_*.so \
     ${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}/dbus-1/system.d/*.conf \
     ${datadir}/icons/hicolor \
     ${datadir}/kconf_update/* \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/knsrcfiles \
     ${datadir}/kservices5/*.desktop \
     ${datadir}/kservices5/*.protocol \
     ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/kxmlgui5/*/*.rc \
     ${datadir}/metainfo/*.xml \
     ${datadir}/polkit-1/actions/*.policy \
 "
 
 FILES_${PN}-dev += " \
     ${datadir}/dbus-1/interfaces/*.xml \
     ${datadir}/kdevappwizard/templates/*.tar.bz2 \
+    ${datadir}/qlogging-categories5/* \
     ${libdir}/cmake/*/*.cmake \
     ${prefix}/mkspecs/modules/qt_*.pri \
 "
diff --git a/recipes-plasma/bluedevil_5.16.4.bb b/recipes-plasma/bluedevil_5.17.2.bb
similarity index 100%
rename from recipes-plasma/bluedevil_5.16.4.bb
rename to recipes-plasma/bluedevil_5.17.2.bb
diff --git a/recipes-plasma/breeze_5.16.4.bb b/recipes-plasma/breeze_5.17.2.bb
similarity index 100%
rename from recipes-plasma/breeze_5.16.4.bb
rename to recipes-plasma/breeze_5.17.2.bb
diff --git a/recipes-plasma/discover_5.16.4.bb b/recipes-plasma/discover_5.17.2.bb
similarity index 100%
rename from recipes-plasma/discover_5.16.4.bb
rename to recipes-plasma/discover_5.17.2.bb
diff --git a/recipes-plasma/kactivitymanagerd.inc b/recipes-plasma/kactivitymanagerd.inc
index 8220b4b..981cf30 100644
--- a/recipes-plasma/kactivitymanagerd.inc
+++ b/recipes-plasma/kactivitymanagerd.inc
@@ -1,42 +1,44 @@
 DESCRIPTION = "KActivity Manager Daemon"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
     boost \
     kconfig \
     kcoreaddons \
     kdbusaddons \
     kglobalaccel \
     kio \
     kwindowsystem \
     kxmlgui \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
 CXXFLAGS += "-DBOOST_DISABLE_ASSERTS"
 
 # the cmake checks for those use try_run(), which fails when cross-compiling
 EXTRA_OECMAKE += " \
     -DHAVE_CXX11_AUTO=ON \
     -DHAVE_CXX11_NULLPTR=ON \
     -DHAVE_CXX11_LAMBDA=ON \
     -DHAVE_CXX11_OVERRIDE=ON \
     -DHAVE_CXX11_UNIQUE_PTR=ON \
     -DHAVE_CXX11_VARIADIC_TEMPLATES=ON \
     -DHAVE_CXX11_INITIALIZER_LISTS=ON \
 "
 
 FILES_${PN} += " \
     ${libdir}/*.so \
 "
 
-FILES_${PN}-dev = ""
+FILES_${PN}-dev = " \
+    ${datadir}/qlogging-categories5 \
+"
diff --git a/recipes-plasma/kactivitymanagerd_5.16.4.bb b/recipes-plasma/kactivitymanagerd_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kactivitymanagerd_5.16.4.bb
rename to recipes-plasma/kactivitymanagerd_5.17.2.bb
diff --git a/recipes-plasma/kde-cli-tools_5.16.4.bb b/recipes-plasma/kde-cli-tools_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kde-cli-tools_5.16.4.bb
rename to recipes-plasma/kde-cli-tools_5.17.2.bb
diff --git a/recipes-plasma/kdecoration_5.16.4.bb b/recipes-plasma/kdecoration_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kdecoration_5.16.4.bb
rename to recipes-plasma/kdecoration_5.17.2.bb
diff --git a/recipes-plasma/kscreen.inc b/recipes-plasma/kscreen.inc
index bb06132..c3a1f07 100644
--- a/recipes-plasma/kscreen.inc
+++ b/recipes-plasma/kscreen.inc
@@ -1,29 +1,31 @@
 DESCRIPTION = "KScreen"
 HOMEPAGE = ""
 LICENSE = "GPL-2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
     qtdeclarative \
     kdbusaddons \
     plasma-framework \
     kconfigwidgets \
+    kcmutils \
     kglobalaccel \
     kwidgetsaddons \
     kxmlgui \
     libkscreen \
 "
 
 SRC_URI = " \
     git://git.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
 FILES_${PN} += " \
     ${datadir}/kded_kscreen \
     ${datadir}/kcm_kscreen \
+    ${datadir}/kpackage \
     ${datadir}/plasma/plasmoids/org.kde.kscreen \
 "
diff --git a/recipes-plasma/kscreen_5.16.4.bb b/recipes-plasma/kscreen_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kscreen_5.16.4.bb
rename to recipes-plasma/kscreen_5.17.2.bb
diff --git a/recipes-plasma/kscreenlocker_5.16.4.bb b/recipes-plasma/kscreenlocker_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kscreenlocker_5.16.4.bb
rename to recipes-plasma/kscreenlocker_5.17.2.bb
diff --git a/recipes-plasma/ksysguard_5.16.4.bb b/recipes-plasma/ksysguard_5.17.2.bb
similarity index 100%
rename from recipes-plasma/ksysguard_5.16.4.bb
rename to recipes-plasma/ksysguard_5.17.2.bb
diff --git a/recipes-plasma/kwayland-integration.inc b/recipes-plasma/kwayland-integration.inc
index af8d48d..ab0537d 100644
--- a/recipes-plasma/kwayland-integration.inc
+++ b/recipes-plasma/kwayland-integration.inc
@@ -1,18 +1,23 @@
 DESCRIPTION = "KWayland Integration"
 HOMEPAGE = ""
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 PR = "r0"
 
 DEPENDS = " \
     kidletime \
     kwindowsystem \
+    kguiaddons \
     kwayland \
 "
 
 SRC_URI = " \
     git://git.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
+
+FILES_${PN} += " \
+    ${libdir}/plugins/kf5/kguiaddons \
+"
diff --git a/recipes-plasma/kwayland-integration_5.16.4.bb b/recipes-plasma/kwayland-integration_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kwayland-integration_5.16.4.bb
rename to recipes-plasma/kwayland-integration_5.17.2.bb
diff --git a/recipes-plasma/kwin.inc b/recipes-plasma/kwin.inc
index f6c8052..b4c1cf9 100644
--- a/recipes-plasma/kwin.inc
+++ b/recipes-plasma/kwin.inc
@@ -1,89 +1,90 @@
 DESCRIPTION = "KWin"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"
 
 DEPENDS = " \
     qtdeclarative \
     qtsensors \
     qtscript \
     kconfigwidgets \
     kcrash \
     kglobalaccel \
     kinit \
     knotifications \
     kpackage \
     plasma-framework \
     kwindowsystem \
     kiconthemes \
     kidletime \
     kwayland \
     kcompletion \
     kdeclarative \
     kcmutils \
     kio \
     ktextwidgets \
     knewstuff \
     kservice \
     kxmlgui \
     kdecoration \
     kscreenlocker \
     libxcb \
     xcb-util-cursor \
     fontconfig \
     libepoxy \
     libinput \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
     file://kwinrc \
 "
 
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma kdoctools
 
 do_install_append() {
     # dirty workaround for aurora crash on Wayland
     rm -rf ${D}/${libdir}/plugins/org.kde.kdecoration2/
 
+    mkdir -p ${D}/${sysconfdir}/xdg/kwinrc
     install -m 644 ${WORKDIR}/kwinrc ${D}/${sysconfdir}/xdg/kwinrc
 }
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/kconf_update_bin/kwin5_update_default_rules \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kpackage/packagestructure/*.so \
     ${libdir}/plugins/org.kde.kwin.scenes/*.so \
     ${libdir}/plugins/org.kde.kglobalaccel5.platforms/*.so \
     ${libdir}/plugins/kwin/effects/configs/*.so \
     ${libdir}/plugins/org.kde.kwin.waylandbackends/*.so \
     ${libdir}/plugins/org.kde.kdecoration2/*.so \
     ${libdir}/plugins/kf5/org.kde.kidletime.platforms/*.so \
     ${libdir}/plugins/org.kde.kwin.platforms/*.so \
     ${libdir}/plugins/platforms/*.so \
     ${libdir}/qml/org/kde/kwin/decoration/* \
     ${libdir}/qml/org/kde/kwin/decorations/plastik/* \
     ${libdir}/qml/org/kde/kwin/private/kdecoration/* \
     ${datadir}/kservices5/*.desktop \
     ${datadir}/kservices5/kwin/*.desktop \
     ${datadir}/knotifications5/*.notifyrc \
     ${datadir}/kservicetypes5/*.desktop \
     ${datadir}/kwincompositing/qml/*.qml \
     ${datadir}/config.kcfg/*.kcfg \
     ${datadir}/kpackage \
 "
 
 FILES_${PN}-dev += " \
     ${libdir}/libkwin*.so \
 "
 
 RDEPENDS_${PN} += " \
     qtvirtualkeyboard-plugins \
     qtvirtualkeyboard-qmlplugins \
     qtwayland-plugins \
     xserver-xorg-xwayland \
 "
diff --git a/recipes-plasma/kwin_5.16.4.bb b/recipes-plasma/kwin_5.17.2.bb
similarity index 100%
rename from recipes-plasma/kwin_5.16.4.bb
rename to recipes-plasma/kwin_5.17.2.bb
diff --git a/recipes-plasma/libkscreen_5.16.4.bb b/recipes-plasma/libkscreen_5.17.2.bb
similarity index 100%
rename from recipes-plasma/libkscreen_5.16.4.bb
rename to recipes-plasma/libkscreen_5.17.2.bb
diff --git a/recipes-plasma/libksysguard_5.16.4.bb b/recipes-plasma/libksysguard_5.17.2.bb
similarity index 100%
rename from recipes-plasma/libksysguard_5.16.4.bb
rename to recipes-plasma/libksysguard_5.17.2.bb
diff --git a/recipes-plasma/milou.inc b/recipes-plasma/milou.inc
index f36bbe9..0d8f09c 100644
--- a/recipes-plasma/milou.inc
+++ b/recipes-plasma/milou.inc
@@ -1,26 +1,27 @@
 DESCRIPTION = "Milou"
 HOMEPAGE = ""
 LICENSE = "GPL-2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
     qtdeclarative \
     kcoreaddons \
+    kitemmodels \
     kdeclarative \
     kservice \
     plasma-framework \
     krunner \
 "
 
 SRC_URI = " \
     git://git.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
 FILES_${PN} += " \
   ${libdir}/qml/org/kde/milou/* \
   ${datadir}/plasma/plasmoids/org.kde.milou \
 "
diff --git a/recipes-plasma/milou_5.16.4.bb b/recipes-plasma/milou_5.17.2.bb
similarity index 100%
rename from recipes-plasma/milou_5.16.4.bb
rename to recipes-plasma/milou_5.17.2.bb
diff --git a/recipes-plasma/plasma-integration_5.16.4.bb b/recipes-plasma/plasma-integration_5.17.2.bb
similarity index 100%
rename from recipes-plasma/plasma-integration_5.16.4.bb
rename to recipes-plasma/plasma-integration_5.17.2.bb
diff --git a/recipes-plasma/plasma-nm.inc b/recipes-plasma/plasma-nm.inc
index 89a25a4..909f9a2 100644
--- a/recipes-plasma/plasma-nm.inc
+++ b/recipes-plasma/plasma-nm.inc
@@ -1,53 +1,52 @@
 DESCRIPTION = "Plasma NM"
 HOMEPAGE = ""
 LICENSE = "GPL-2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
 DEPENDS = " \
     qtdeclarative \
     qttools \
     networkmanager-qt \
     modemmanager-qt \
     kwindowsystem \
     kservice \
     kcompletion \
     kwidgetsaddons \
     kio \
     kcoreaddons \
     kwallet \
     kitemviews \
     kxmlgui \
     kconfigwidgets \
     kiconthemes \
     solid \
     kdbusaddons \
     knotifications \
     plasma-framework \
     kdeclarative \
     kinit \
     kitemmodels \
     qca \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
-    file://0001-wifi-list-view-hotfix.diff \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 
 EXTRA_OECMAKE += " \
     -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST} \
     -DBUILD_MOBILE=ON \
 "
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/*.so \
     ${libdir}/qml/org/kde/plasma/networkmanagement \
     ${datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement \
     ${datadir}/kcm_networkmanagement/qml/*.qml \
     ${datadir}/kpackage \
 "
diff --git a/recipes-plasma/plasma-nm/0001-wifi-list-view-hotfix.diff b/recipes-plasma/plasma-nm/0001-wifi-list-view-hotfix.diff
deleted file mode 100644
index 666ae93..0000000
--- a/recipes-plasma/plasma-nm/0001-wifi-list-view-hotfix.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-commit ac38ebd52d2936d1c2fd34507df90ba3ed64c841
-Author: Volker Krause <vkrause@kde.org>
-Date:   Sat Mar 30 22:29:55 2019 +0100
-
-    Actually make the network list view show up
-    
-    Reviewers: jgrulich!
-    
-    Subscribers: plasma-devel
-    
-    Tags: #plasma
-    
-    Differential Revision: https://phabricator.kde.org/D20132
-
-diff --git a/mobile/wifi/package/contents/ui/main.qml b/mobile/wifi/package/contents/ui/main.qml
-index 224de727..31aeff57 100644
---- a/mobile/wifi/package/contents/ui/main.qml
-+++ b/mobile/wifi/package/contents/ui/main.qml
-@@ -79,7 +79,6 @@ Kirigami.ApplicationItem {
- 
-     NetworkListView {
-         id: networkListview
--        anchors.fill: parent
-     }
- 
-     Component {
diff --git a/recipes-plasma/plasma-nm_5.16.4.bb b/recipes-plasma/plasma-nm_5.17.2.bb
similarity index 100%
rename from recipes-plasma/plasma-nm_5.16.4.bb
rename to recipes-plasma/plasma-nm_5.17.2.bb
diff --git a/recipes-plasma/plasma-pa_5.16.4.bb b/recipes-plasma/plasma-pa_5.17.2.bb
similarity index 100%
rename from recipes-plasma/plasma-pa_5.16.4.bb
rename to recipes-plasma/plasma-pa_5.17.2.bb
diff --git a/recipes-plasma/plasma-workspace.inc b/recipes-plasma/plasma-workspace.inc
index 69ee5a2..e72ddb1 100644
--- a/recipes-plasma/plasma-workspace.inc
+++ b/recipes-plasma/plasma-workspace.inc
@@ -1,84 +1,88 @@
 DESCRIPTION = "Plasma Workspace"
 HOMEPAGE = ""
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24"
 PR = "r0"
 
 DEPENDS = " \
     qtdeclarative \
     baloo \
     kcoreaddons \
     kcrash \
     solid \
     kactivities \
     kcmutils \
     kdbusaddons \
     kdeclarative \
     kdelibs4support \
     kdesu \
     kidletime \
     kitemmodels \
     kjsembed \
     knewstuff \
     knotifications \
     knotifyconfig \
     kpackage \
     krunner \
     kscreenlocker \
     ktexteditor \
     kwallet \
     kwayland \
     kwin \
     libksysguard \
     networkmanager-qt \
     phonon \
     plasma-framework \
     prison \
+    kpeople \
+    kactivitiesstats \
+    libkscreen \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/${BPN};nobranch=1 \
 "
 S = "${WORKDIR}/git"
 
 inherit cmake_plasma
 inherit kdoctools
 
 EXTRA_OECMAKE += " -DBUILD_xembed-sni-proxy=OFF"
 
 FILES_SOLIBSDEV = ""
 FILES_${PN} += " \
     ${libdir}/qml/org/kde \
+    ${datadir}/kglobalaccel \
     ${datadir}/kstyle/themes/*.themerc \
     ${datadir}/ksmserver/themes \
     ${datadir}/ksplash/Themes \
     ${datadir}/kio_desktop \
     ${datadir}/plasma/plasmoids \
     ${datadir}/plasma/look-and-feel \
     ${datadir}/plasma/shareprovider \
     ${datadir}/plasma/wallpapers \
     ${datadir}/plasma/services/*.operations \
     ${datadir}/solid/actions/*.desktop \
     ${datadir}/sddm/themes \
     ${datadir}/desktop-directories/*.directory \
     ${datadir}/wayland-sessions/*.desktop \
     ${datadir}/xsessions/*.desktop \
     ${datadir}/kpackage \
 "
 
 FILES_${PN}-dev += " \
     ${libdir}/libcolorcorrect.so \
     ${libdir}/libnotificationmanager.so \
     ${libdir}/libtaskmanager.so \
     ${libdir}/libkworkspace5.so \
     ${libdir}/libplasma-geolocation-interface.so \
     ${libdir}/libweather_ion.so \
 "
 
 RDEPENDS_${PN} += " \
     kinit \
     milou \
     xprop \
     xset \
     qttools-tools \
 "
diff --git a/recipes-plasma/plasma-workspace_5.16.4.bb b/recipes-plasma/plasma-workspace_5.17.2.bb
similarity index 100%
rename from recipes-plasma/plasma-workspace_5.16.4.bb
rename to recipes-plasma/plasma-workspace_5.17.2.bb
diff --git a/recipes-plasma/polkit-kde-agent-1_5.16.4.bb b/recipes-plasma/polkit-kde-agent-1_5.17.2.bb
similarity index 100%
rename from recipes-plasma/polkit-kde-agent-1_5.16.4.bb
rename to recipes-plasma/polkit-kde-agent-1_5.17.2.bb
diff --git a/recipes-plasma/powerdevil_5.16.4.bb b/recipes-plasma/powerdevil_5.17.2.bb
similarity index 100%
rename from recipes-plasma/powerdevil_5.16.4.bb
rename to recipes-plasma/powerdevil_5.17.2.bb
diff --git a/recipes-plasma/systemsettings_5.16.4.bb b/recipes-plasma/systemsettings_5.17.2.bb
similarity index 100%
rename from recipes-plasma/systemsettings_5.16.4.bb
rename to recipes-plasma/systemsettings_5.17.2.bb
diff --git a/recipes-plasma/xdg-desktop-portal-kde_5.16.4.bb b/recipes-plasma/xdg-desktop-portal-kde_5.17.2.bb
similarity index 100%
rename from recipes-plasma/xdg-desktop-portal-kde_5.16.4.bb
rename to recipes-plasma/xdg-desktop-portal-kde_5.17.2.bb