diff --git a/kgpg-21.03.90.tar.xz b/kgpg-21.03.90.tar.xz
deleted file mode 100644
index e105815..0000000
--- a/kgpg-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16ab4a58c7c400e9381b69c49b6ac32339f5e524682e86bd421a7ad27a7173dd
-size 2886100
diff --git a/kgpg-21.03.90.tar.xz.sig b/kgpg-21.03.90.tar.xz.sig
deleted file mode 100644
index e3893d9..0000000
--- a/kgpg-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrsACgkQu0YzUNbv
-Me/rSBAAgmuQ7YoM1HrkKg2FuFKU4OOH0g0PfYbK39ANMzBJrPX6ob1+iCDFI+8z
-ANhmH8bTi828SddgBJXuNAV7ErhOnfNFkvGoqsT8Rx4+snJVWgigt0WDHF5gz2VS
-SxdxbToArYvMWKD+6WTbM4pPlEW22WY8jVpNN2IUYdt6aVO/NFt0nNpsk5W420AQ
-2ckLvDbWi8AbwCjC4YEg4kennxzpyS2EUQuPW8qwqSWiS2s4MBdL2+wZkmilhGB/
-ecPXJmPJlE4LpbVmedmSYUho89J4r5YVzrOSE4tKNn6vX0miqoZ2zcQJQob5gJNq
-y1+nXkWIqWLmGpUtE69pzG99/bhvjt1xglZZ0miobsRu79fCea/murLm7OlviD9Z
-WykW+lbQ0t1d3vRSMvw4mh9acpAaIoUWBRaMVjS1E8cX2ulxdZCbAgCWFwOb/8NR
-lWncN8en7EULgKXRxXJRON7kaPZa5gp1LJZWekebKDpHdQVzUtDAFSK0z0+SdUUk
-yVOWnYV+vMiTDIvrX8Iu6KjMrz5KDUSpija1P09wZ8dIXwM+J+9MPP/0QJI79w+0
-HQbEBAmtAb/uWssj0FgHGDEGzLEL5oYUiSQKgADXzCEpYe4rq34VYJdy1A8/UeI/
-ArmbQonU3WoBT8H4L0B6T3cCsyVY/52vJSwKBv0VfITjt2KdtQg=
-=NgB+
------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 c9c75ba..ca40548 100644
--- a/kgpg.changes
+++ b/kgpg.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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/releases/21.04.0
+- 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>
 
diff --git a/kgpg.spec b/kgpg.spec
index 3e48f60..752870f 100644
--- a/kgpg.spec
+++ b/kgpg.spec
@@ -21,14 +21,18 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kgpg
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Encryption Tool
 License:        GPL-2.0-or-later
 Group:          Productivity/Security
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-Patch1:         kgpg-autostart.diff
+URL:            https://apps.kde.org/kgpg
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%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/unstable/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