diff --git a/0001-Fix-kcmfontinst-install-destination.patch b/0001-Fix-kcmfontinst-install-destination.patch
deleted file mode 100644
index 0957df6..0000000
--- a/0001-Fix-kcmfontinst-install-destination.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5aae31b1eab0d9f5aefa39cbf79772e1baf71c3b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sun, 30 May 2021 18:00:26 +0200
-Subject: [PATCH] Fix kcmfontinst install destination
-
-This reverts part of a8ec95411a9f6, KCModuleLoader can't load kcm_fontinst
-if the library is installed in KDE_INSTALL_PLUGINDIR/kcms/; looks like that
-only works for KCMs using QML.
-
-BUG: 436306
-FIXED-IN: 5.22.0
----
- kcms/kfontinst/kcmfontinst/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/kcms/kfontinst/kcmfontinst/CMakeLists.txt b/kcms/kfontinst/kcmfontinst/CMakeLists.txt
-index fca680926..99dbbd311 100644
---- a/kcms/kfontinst/kcmfontinst/CMakeLists.txt
-+++ b/kcms/kfontinst/kcmfontinst/CMakeLists.txt
-@@ -18,8 +18,7 @@ target_link_libraries(kcm_fontinst
-     X11::X11
- )
- 
--set_target_properties(kcm_fontinst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms")
--install(TARGETS kcm_fontinst  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
-+install(TARGETS kcm_fontinst  DESTINATION ${KDE_INSTALL_PLUGINDIR})
- install( FILES fontinst.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
- install( FILES kfontinst.knsrc DESTINATION  ${KDE_INSTALL_KNSRCDIR} )
- 
--- 
-2.25.1
-
diff --git a/plasma-workspace-5.21.90.tar.xz b/plasma-workspace-5.21.90.tar.xz
deleted file mode 100644
index 98af9b4..0000000
--- a/plasma-workspace-5.21.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e8fca6d8b0a6cd43e26fc21f780c6d38cc9bd0dfe834d3cf8f7fa70e43b08ae
-size 9673444
diff --git a/plasma-workspace-5.21.90.tar.xz.sig b/plasma-workspace-5.21.90.tar.xz.sig
deleted file mode 100644
index ff41ce4..0000000
--- a/plasma-workspace-5.21.90.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmCdKKEACgkQ7JTRj38F
-mX5boAgAkA1i/BBe3y3QswsfYaWBGLZGPqHQzbnSlaBmWLWOYgswECpjUHOrDdk0
-eY5DsZueNDOh1fvpkOw6j6c8pAPwJ2PaIP61LxD/lNb3gQ1kWhJbt29mynEFuYaY
-QNkRm6O82QlCrneHMj0Q2xfqKtwgUo/UxIXfypi/dN8dK0UTwdJr27edShBr6Exw
-+3t7EVxBJxptcACjaC6+QVykJ9zUgqH45N7rum50l2J/uMlgtFzBH7sKa5eSOyp9
-m7hsnhwCicBc8fxuxNIaTcZKGayDK3Qm9marGEpnqtDZNitvohRsZPPimAQizek2
-uCgsDTfSV2AOPBmRO6A2GyrssBjf+A==
-=pv7V
------END PGP SIGNATURE-----
diff --git a/plasma-workspace-5.22.0.tar.xz b/plasma-workspace-5.22.0.tar.xz
new file mode 100644
index 0000000..39a59e0
--- /dev/null
+++ b/plasma-workspace-5.22.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a80c5245f9427b26829dd63e18e22066d965df79ce111c1bf53eb474a881cede
+size 8349256
diff --git a/plasma-workspace-5.22.0.tar.xz.sig b/plasma-workspace-5.22.0.tar.xz.sig
new file mode 100644
index 0000000..ea88c54
--- /dev/null
+++ b/plasma-workspace-5.22.0.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmC45VAACgkQ7JTRj38F
+mX4cAwf9H7u3cRdDBnQFyT6S/PzBUM7wCP8bvlrrlwe4aupMASvR7KOJzfIHaAZE
+5O7LBWPVL8WMjdto/UWKyJwdFnqYWPrK6GSkMv/L7Mjkxq2gge4GUNDH5vDhGXs9
+PxVWcc3FovmM6xljSWfnbks5Ev6fTfsd/MBR4wQaO8NAGf2vmqZCCIw0UotJdmkj
+rdRPHLltVcheoBiZbZz+4a75D7jj4pFO/gWDhlle54h/gN/vrPbiRrIyzj9/lpv8
+gYl438R2eLKhb7PLqiK52Y/yq6MlYCIxZrT9NymtlpW+VndK+w+KLcDGPPAV8tNI
+TCddAqd1OG4jXDum15zEG7bN14IQkQ==
+=iRmQ
+-----END PGP SIGNATURE-----
diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes
index 454676e..a25745d 100644
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun  3 13:06:17 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.22.0
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/5.22.0
+- Too many changes to list here
+- Drop patches, now upstream:
+ * 0001-Fix-kcmfontinst-install-destination.patch
+
 -------------------------------------------------------------------
 Mon May 31 06:20:16 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec
index 091f0ec..0ffdd4d 100644
--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -30,20 +30,18 @@ Name:           plasma5-workspace
 %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
 # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
 %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
-Version:        5.21.90
+Version:        5.22.0
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            http://www.kde.org/
-Source:         https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
+Source:         plasma-workspace-%{version}.tar.xz
 %if %{with lang}
-Source1:        https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
+Source1:        plasma-workspace-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 Source3:        baselibs.conf
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-Fix-kcmfontinst-install-destination.patch
 # PATCHES 501-??? are PATCH-FIX-OPENSUSE
 Patch501:       0001-Use-qdbus-qt5.patch
 Patch502:       0001-Ignore-default-sddm-face-icons.patch