diff --git a/.gitignore b/.gitignore
index 79a158e..803c495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@
 /breezetwilight-defaults
 /breezetwilight-fullscreenpreview.jpg
 /breezetwilight-preview.png
+/plasma-workspace-5.21.0.tar.xz
diff --git a/0008-systemd-Move-kwin-to-wants.patch b/0008-systemd-Move-kwin-to-wants.patch
deleted file mode 100644
index d0ffd16..0000000
--- a/0008-systemd-Move-kwin-to-wants.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 75bdbc4a3ce6e00a29025e0a15455fb92fb9cd7a Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 27 Jan 2021 10:58:20 +0000
-Subject: [PATCH 08/10] [systemd] Move kwin to "wants"
-
-As kwin-wayland is still spawned manually by us for Plasma 5.21.
-
-
-(cherry picked from commit 07b2d67f5b4c8114822c319dc2b8d77fac20a86f)
----
- startkde/systemd/plasma-workspace@.target | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/startkde/systemd/plasma-workspace@.target b/startkde/systemd/plasma-workspace@.target
-index ca0bf390d..9fae5fe3c 100644
---- a/startkde/systemd/plasma-workspace@.target
-+++ b/startkde/systemd/plasma-workspace@.target
-@@ -1,6 +1,6 @@
- [Unit]
- Description=KDE Plasma Workspace
--Requires=plasma-kwin_%i.service plasma-core.target xdg-desktop-autostart.target graphical-session.target
--Wants=plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service plasma-baloo.service plasma-foreground-booster.service
-+Requires=plasma-core.target xdg-desktop-autostart.target graphical-session.target
-+Wants=plasma-kwin_%i.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service plasma-baloo.service plasma-foreground-booster.service
- BindsTo=graphical-session.target
- Before=graphical-session.target xdg-desktop-autostart.target plasma-ksplash-ready.service plasma-restoresession.service
--- 
-2.29.2
-
diff --git a/0009-Make-ksmserver-s-lock-screen-detection-automatic.patch b/0009-Make-ksmserver-s-lock-screen-detection-automatic.patch
deleted file mode 100644
index ff1c6ec..0000000
--- a/0009-Make-ksmserver-s-lock-screen-detection-automatic.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3800aa256e2dec27ae8c80f428512ed3960d0575 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 27 Jan 2021 14:54:57 +0000
-Subject: [PATCH 09/10] Make ksmserver's lock screen detection automatic
-
-Use of a flag doesn't make it easy to share code, especially with the
-systemd units.
-
-
-(cherry picked from commit d3adf06c72301365b0c707f968974574e345adac)
----
- ksmserver/main.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
-index fcd8dd724..f01fbe755 100644
---- a/ksmserver/main.cpp
-+++ b/ksmserver/main.cpp
-@@ -286,6 +286,12 @@ int main(int argc, char *argv[])
-         flags |= KSMServer::InitFlag::NoLockScreen;
-     }
- 
-+    // we use the session_type here as ksmserver is already forced as X above
-+    // in wayland, kwin manages the lock screen
-+    if (qgetenv("XDG_SESSION_TYPE") == QByteArrayLiteral("wayland")) {
-+        flags |= KSMServer::InitFlag::NoLockScreen;
-+    }
-+
-     KSMServer *server = new KSMServer(flags);
- 
-     // for the KDE-already-running check in startkde
--- 
-2.29.2
-
diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 434c532..6c3d2a1 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -15,8 +15,8 @@
 
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
-Version: 5.20.90
-Release: 9%{?dist}
+Version: 5.21.0
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     https://invent.kde.org/plasma/%{name}
@@ -64,8 +64,6 @@ Patch105:       plasma-workspace-5.7.3-folderview_layout.patch
 ## upstreamable Patches
 
 ## upstream Patches
-Patch8: 0008-systemd-Move-kwin-to-wants.patch
-Patch9: 0009-Make-ksmserver-s-lock-screen-detection-automatic.patch
 
 ## upstream Patches (master branch)
 
@@ -420,8 +418,6 @@ BuildArch: noarch
 %setup -q -a 20
 
 ## upstream patches
-%patch8 -p1 -b .0008
-%patch9 -p1 -b .0009
 
 %patch100 -p1 -b .konsole-in-contextmenu
 # FIXME/TODO:  it is unclear whether this is needed or even a good idea anymore -- rex
@@ -727,6 +723,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 %endif
 
 %changelog
+* Thu Feb 11 2021 Jan Grulich <jgrulich@redhat.com> - 5.21.0-1
+- 5.21.0
+
 * Fri Jan 29 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.20.90-9
 - pull in upstream fix for lockscreen detection (kde#432251)
 
diff --git a/sources b/sources
index 249dabb..5678fe3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
-SHA512 (plasma-workspace-5.20.90.tar.xz) = 06c75637600053a8329791c58d2500f9f29f539e9b54a430f3ac7d81d8515a5ef412f972a0b564b46081da558b8facbce4d3f713ebd658e0e66350b409425b87
 SHA512 (breezetwilight-defaults) = f84d4543c0c42609f4f3300fd720ebfc60686c0e5f53a1695bea603876697dd7eb27399f705035b81ab4b5e5eeabec6569aeeff6100a96149f8a2921376ae223
 SHA512 (breezetwilight-fullscreenpreview.jpg) = e9e60cbe450696d9d7ed1f5f30122150079f0b75106be3a52122a1c246dca66bd99b75be850434ec3ae37b003a51423d495a506d3e35f2e0a563be172dec1cdb
 SHA512 (breezetwilight-preview.png) = e625ebd61624a0ac45d80f274c7f6ed2f1dd3ac1f7d66cc2a72524545ca4fc7a3997dd90a57a506b4840978a47c5403630b65ea546d37ab1de165ebf013e8148
+SHA512 (plasma-workspace-5.21.0.tar.xz) = c3739f9b689e08912f78ffb9ba1ba4ef9661c6aabf9e5a359604b5683917f35c4b47b94bbea684c21ff622507ec9196b6f532f5530fb78311f5007ff32d1f83b