diff --git a/kgpg-20.12.3.tar.xz b/kgpg-20.12.3.tar.xz
deleted file mode 100644
index d2845de..0000000
--- a/kgpg-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfc721aa0cd2a7707cba5c446a66e57b4c51ffbb79ebbf968af6a906dba39d7c
-size 2892236
diff --git a/kgpg-20.12.3.tar.xz.sig b/kgpg-20.12.3.tar.xz.sig
deleted file mode 100644
index d7d890b..0000000
--- a/kgpg-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEIACgkQu0YzUNbv
-Me/muQ/9Eoob1a0PUXeJNDLxH6LhGLdmWng9b4bH2E5UaSqD8b8FkJXrsl8PyFny
-lrCJBUfqm/N5EDigQHc5gbjTt4L8oVziTyy9E/HTQN4htTHqcEfLiDCII7/I6MBa
-792Vgusf/FLn9MSxnkstw0uO497mo+il8k+hm87/SDP10srrrfkF0tF3TSKLnqB2
-Qf2uT7Lp2nb6m96GaVgAqa/PdaCedaJTIUS7tWqZMGw0ZW2Gqkrz42lPj8J87Vmf
-oGrt95Ra6HUFZGOzk0K1RgcEc+lRELv+ucAtxWqW9A8ElwntfV8fBDsXn+XEkaOn
-H9oA4rf0mn/1aSvIVKF/ZI/+ba2t6AKwWQgPXHBNVub0SWwp7/IX/JEMA65Rfwpg
-u+lCJoFv+6f05h3TRJAv3MnhSAVSqEUvDE0srDtxMK6Ehru/CxYZm+1lmxziu64z
-3GDpg4KIoq+QWMNHHXuWfsavHrw+1jJ4P2UkwTMwjRESBiv7vXkuR5QUNaE7pfn8
-3Uf01Cn/YvDozU26+0df59m0Zj2a1bTAI5BV4pZt1qdrpOzYErfueAhXK+lYQb5i
-h03XehCjqb306qgyPj8eB8Qkv5dZ72p6Kvz7HjyTcSjZe7pKU1GofFoTTPOFlQU9
-M/uVQ+5OU5qyjOn0FdBaXFtN5vvCmrScRDAHwhu1P2KMp/hzjmk=
-=LR6e
------END PGP SIGNATURE-----
diff --git a/kgpg-21.04.0.tar.xz b/kgpg-21.04.0.tar.xz
new file mode 100644
index 0000000..7a76f38
--- /dev/null
+++ b/kgpg-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cee117cd98473c546b87efb0b14f230d955532e6bf5311cc2d6181c5cb8cbd28
+size 2886168
diff --git a/kgpg-21.04.0.tar.xz.sig b/kgpg-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..423fd6b
--- /dev/null
+++ b/kgpg-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvsACgkQu0YzUNbv
+Me/dow/9HIF2yI0wqBEXvxRI/oLFnk7Oc/0kfvZDHjGPoGH7YaxIUY/Tbd8QlT60
+FfQqI5kTD+nhKfpwmluKoxc9VYsM1OwmfT8iHytu+/UsjgQmWEmWtHmvJswPSDWK
+1VsyRP32cj/sz0eIdvCCDIm+0FJI7ZGVUHgFcGNyy0Hb96cp6ywr60isddNOvuxr
+OEj8eV+SpLzlR+jDXXEGsGAAiiVr3H+rJnrHgF+4JGw0oFLc8UMxVDsc6jLSwn8Q
+0Y6HKCfw/TpYxeIAZimQ+vbHVjyij3r9fRDFF7udjeMw+QAeAybKNjDrdH0BWi2t
+cbkt/o3UfJvdpIJtY/cat1+8Q52/7TS8Y2NbzN8oG0CG+GOjZekIRvjHBBPnfYv7
+cGOX6+RJ+T5nPIsJ4rBm4JLRZNKpQDxFqV9GsaVhwf9wB/fPI8BK1wtmFgW0zThj
+ymJNPwJBFq+Qn6/oSUypkzvvQTCCs3c9WEbs8aYUZpLWglOCXLy8l8KeGezx2TI0
+y4ANDJUuEE7w4Xjs1EbyVTfvYVmdNDB3GloHboibwiF66+uBUtkU6LZGN4OZI68n
+9qTLEzGt0TdHXBJN5DCoazu9zlwKmNhY1PsysATGy7R58oiCbF8PYHuCwKr7YWix
+OR5YGqj7aaitx7yw1Su1dHixV5WZ39D1QmOSuqTJw/kCR2Zyqbw=
+=Ha0a
+-----END PGP SIGNATURE-----
diff --git a/kgpg.changes b/kgpg.changes
index 61f68e5..e71c13c 100644
--- a/kgpg.changes
+++ b/kgpg.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:53 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.04
+- No code change since 21.03.90
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
+-------------------------------------------------------------------
+Fri Apr  9 17:40:20 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.90
+  * New feature release
+- No code change since 21.03.80
+
+-------------------------------------------------------------------
+Sun Mar 21 13:28:05 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Too many changes to list here.
+
 -------------------------------------------------------------------
 Thu Mar  4 06:10:22 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kgpg.spec b/kgpg.spec
index 98553e2..752870f 100644
--- a/kgpg.spec
+++ b/kgpg.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kgpg
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,14 +21,18 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kgpg
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Encryption Tool
 License:        GPL-2.0-or-later
 Group:          Productivity/Security
-URL:            https://www.kde.org
+URL:            https://apps.kde.org/kgpg
 Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-Patch1:         kgpg-autostart.diff
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
+Patch0:         kgpg-autostart.diff
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  libgpgme-devel
@@ -53,10 +57,6 @@ BuildRequires:  cmake(Qt5Widgets)
 Requires:       gpg2
 # It can only build on the same platforms as Qt Webengine
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 BuildRequires:  libboost_headers-devel
 Recommends:     %{name}-lang
 
@@ -66,8 +66,7 @@ Kgpg is a simple GUI for gpg
 %lang_package
 
 %prep
-%setup -q -n kgpg-%{version}
-%patch1
+%autosetup -p0
 
 %build
 %cmake_kf5 -d build
@@ -85,18 +84,17 @@ Kgpg is a simple GUI for gpg
 %license COPYING
 %doc AUTHORS
 %config %{_kf5_configdir}/autostart/org.kde.kgpg.desktop
-%dir %{_kf5_appstreamdir}
 %doc %lang(en) %{_kf5_htmldir}/en/kgpg/
 %{_kf5_applicationsdir}/org.kde.kgpg.desktop
 %{_kf5_appstreamdir}/org.kde.kgpg.appdata.xml
 %{_kf5_bindir}/kgpg
 %{_kf5_configkcfgdir}/kgpg.kcfg
 %{_kf5_dbusinterfacesdir}/org.kde.kgpg.Key.xml
+%{_kf5_debugdir}/kgpg.categories
 %{_kf5_iconsdir}/hicolor/*/*/*
 %{_kf5_kxmlguidir}/kgpg/
 %{_kf5_servicesdir}/ServiceMenus/
 %{_kf5_sharedir}/kgpg/
-%{_kf5_debugdir}/kgpg.categories
 
 %if %{with lang}
 %files lang -f %{name}.lang