diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index de43314..b002aa4 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,4 @@
+AUX ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch 628 BLAKE2B a069558012a58e83443c82a50d26507f113c8f2f85afbc43c2d0280334281a73f6ca1502390f4779e0fcbb5d3efab34b577009a8da33be585da4b73682eb307a SHA512 d952ab61591b8d6f7270f58fd240fa9258158f117f228a818376f362006cd6d18e6125961f9c0005807964b52a89ac2bc9c2f70b423bd7dffbc0305b4cf6e318
+AUX ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch 1948 BLAKE2B abaf60aab50905c86a8a4cfcfc225681c805fce032298112189e14b49a04f1ddd75373eca0ce14a8460fce393575b0daa9e6f9ef908ed93ed7162af8e7e23576 SHA512 458824f0b8949975dc1c89f493b6bff9e30681b25d06d4880ef970f7c8ea6494cb9d7f84446450556fad996cf3a31ae084e37567a8006f14305f96191004c524
 DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2
 EBUILD ksysguard-5.22.0-r1.ebuild 1526 BLAKE2B 923919853aa1f1cc742ad8063909a7ed7234f1b4588ea06f6606c2c454d21c9a0a21bc4bcf3dda99586f45b4843b4a0487740fdd0d517c36692de35a5147a6ee SHA512 886d8bbbb7ddc214ec224c95b5a83df7f16fb9cc20d8d11bd395f7de20ece09e212ad463fae34998086d9854b0afc3b6cbfcf3bb28bd0432788d7d99f5a6e789
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
new file mode 100644
index 0000000..8eecf7d
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch
@@ -0,0 +1,21 @@
+From 6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 Mon Sep 17 00:00:00 2001
+From: Shriraj Hegde <shriraj.hegde@gmail.com>
+Date: Wed, 9 Jun 2021 08:21:46 +0000
+Subject: [PATCH] Add StartupWMClass to desktop file
+
+---
+ gui/org.kde.ksysguard.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gui/org.kde.ksysguard.desktop b/gui/org.kde.ksysguard.desktop
+index 0c59d5b7..feb4f220 100755
+--- a/gui/org.kde.ksysguard.desktop
++++ b/gui/org.kde.ksysguard.desktop
+@@ -224,3 +224,4 @@ StartupNotify=true
+ X-DBUS-StartupType=Multi
+ Categories=Qt;KDE;System;
+ X-DBUS-ServiceName=org.kde.ksysguard
++StartupWMClass=ksysguard
+-- 
+GitLab
+
diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
new file mode 100644
index 0000000..d8e63cf
--- /dev/null
+++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch
@@ -0,0 +1,59 @@
+From cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 5 Aug 2021 21:01:30 +0200
+Subject: [PATCH] Port to QtQuickDialogWrapper
+
+---
+ CMakeLists.txt    |  2 +-
+ gui/Workspace.cpp | 13 +++++--------
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23069e76..dcb92975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(KSYSGUARD_VERSION 4.98.0)
+ set(KSYSGUARD_STRING_VERSION "${KSYSGUARD_VERSION}")
+ 
+ set(QT_MIN_VERSION "5.15.0")
+-set(KF5_MIN_VERSION "5.78")
++set(KF5_MIN_VERSION "5.80")
+ 
+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}  ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+diff --git a/gui/Workspace.cpp b/gui/Workspace.cpp
+index 827d63e1..bdd03743 100644
+--- a/gui/Workspace.cpp
++++ b/gui/Workspace.cpp
+@@ -29,8 +29,8 @@
+ #include <KMessageBox>
+ #include <KAcceleratorManager>
+ #include <KActionCollection>
+-#include <KNewStuff3/KNS3/DownloadDialog>
+ #include <KNewStuff3/KNSCore/Engine>
++#include <KNS3/QtQuickDialogWrapper>
+ #include <KConfigGroup>
+ 
+ #include "WorkSheet.h"
+@@ -307,14 +307,11 @@ void Workspace::uploadHotNewWorksheet()
+ }
+ void Workspace::getHotNewWorksheet()
+ {
+-    KNS3::DownloadDialog dialog(QStringLiteral("ksysguard.knsrc"));
+-    if( dialog.exec() == QDialog::Rejected )
+-        return;
+-
+-    KNS3::Entry::List entries = dialog.installedEntries();
+-    foreach(KNS3::Entry entry, entries) {
++    KNS3::QtQuickDialogWrapper dialog(QStringLiteral("ksysguard.knsrc") );
++    const QList<KNSCore::EntryInternal> entries = dialog.exec();
++    for (auto entry : entries) {
+         if(!entry.installedFiles().isEmpty()) {
+-            QString filename = entry.installedFiles().first();
++            const QString filename = entry.installedFiles().constFirst();
+             restoreWorkSheet(filename, true);
+         }
+     }
+-- 
+GitLab
+