diff --git a/granatier-21.03.90.tar.xz b/granatier-21.03.90.tar.xz
deleted file mode 100644
index 6c200d2..0000000
--- a/granatier-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3506fb4c3a13b26edfe0e9af7bcbda48c2c372a4a800892d162f0208c5de2251
-size 1952848
diff --git a/granatier-21.03.90.tar.xz.sig b/granatier-21.03.90.tar.xz.sig
deleted file mode 100644
index 6c5cd90..0000000
--- a/granatier-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrkACgkQu0YzUNbv
-Me+f9A//Zp9gkKraBxKjbgHb3tcCgSgxq0wIk6Ex8Ota/YJCbgTQ16tDSswbdBRQ
-GZELJPkyut3AmrfEXKNc+/NzYYN448H30PXrObOfO6Jhxc8iTnrp1SB+j5axnOXk
-D4iTyKvKp3ZnC1lIwIT1VtL3ucrNIq/TijUdSuVjSUfnnRSg7gSJttRpKcgy0qPo
-SmjNX8pwDGmNriCHpXZ3SUhZ3ZbZVDuGjNaPiGGKhg41N9BnUB0nvw0SIyFkJUNn
-8U1ksdymFmMDYWnelvnVDolYB7Qotlc6AEZFHoX84ptEnezqu3A8mY9SpXUeVuA1
-hE1rJxYZhqyZ1luTXqjMEul+MOXlk4lWM5Ps860ZtSuT0X9TaN20DBeFO3UfiZc3
-7iBU3iLIU6CB8HwSSR5ujMzUsSSIMpzH0Z3E/MIZ2J9nVrN804dDhsQQUP6Hc34D
-TBAHlU2oJdS4Y0h42S13qgZzURhY90RqSKq0DDWnOeJXyMqWmRIl2HRuWo7arNHO
-PG6BUFWK48+sOdqMvKghhb27/SoRL0d4bMIAt14tGbYBzVGHI1Mm4RnDO0WKCDuo
-ZvJPqpvAUyrUet7IpfByDMTl5p65xrqmwWD4ePoHEWv+o2nvWAsvrgpHfSFgQfo/
-gLElIiJDg+oAC6a4H4wH2LcEtXiogUom9BOA2AkLpnltktz4ywQ=
-=xd9J
------END PGP SIGNATURE-----
diff --git a/granatier-21.04.0.tar.xz b/granatier-21.04.0.tar.xz
new file mode 100644
index 0000000..3ddd5e9
--- /dev/null
+++ b/granatier-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e84bf46f618e6ab66cae8baee528486bba14eed38c92bff89b3e0022ecc99661
+size 1952812
diff --git a/granatier-21.04.0.tar.xz.sig b/granatier-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..b0ffa77
--- /dev/null
+++ b/granatier-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvMACgkQu0YzUNbv
+Me+MxA//T/ya+eLiH/HSpdKwL6qR5KcE05VigzlE+ZYO8J4wA+yPi6uPUx7VUa//
+0IR8LeuSzSmlNofHNTkhVaoR0WTMkxCEXPc1UYA0MFMtk15/9J4TSsY3k7PjFnfd
+mmfuWu+Bh+ZQIi82gwLU9J93wHHpvQq8tdiIAvQV+ZwFYDRfoduhDpSevoDVoJ0Y
+kQxFmAFiE9S0SPrXi27BC4QVPRMxMIsrA34O+JEPG0eaTcAW0Itf+RvKB1BMGMBm
+YXLXMJwq6ZDhCSCmyK/nzuqOEuBozWmDaHlhCgdBGm9m+SM+69HuzsdkkpYXb66W
+Wi4+gVIykhd9FvNNC0c1p4j5SbUUYdqlatzSTrvdLTqzo5aTaPrGk6PNvqeOn6OZ
+tDkevH8hD5o28cjbZVJ+R06bYao7yPz9mxoDZpo/lLlWWFbRrPMetnSL/43wMLSU
+NXn2hghy3QITbzzMuUZUmKxjJyGcOS8DgSk47hR/42DYJO5MN1uICvmEFW15feoJ
+mRKtu0Uvarg1uOwgoLk/9N41H05Ac2aZvievuby/yUHNz391JAxyxLKu7+MgwO7B
+4f4rYEAhh/zrzx2AuF9jyr9+avnAopxdCsMznI7YHmMG1VOX8XcEsskZkQDtIany
+S9hy13oWMZzNXMdEfSU95G7VyTZm2erSzR/+55fQWkm0gSbF3Rw=
+=ttVD
+-----END PGP SIGNATURE-----
diff --git a/granatier.changes b/granatier.changes
index 1cb66c5..26b6efe 100644
--- a/granatier.changes
+++ b/granatier.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:12 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:39:39 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/granatier.spec b/granatier.spec
index ec78362..d7e8c48 100644
--- a/granatier.spec
+++ b/granatier.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           granatier
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
-Summary:        Bomberman-like game for KDE
+Summary:        Bomberman-like game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Action/Arcade
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/granatier
+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
 BuildRequires:  extra-cmake-modules
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake(KF5Config)
@@ -50,10 +54,6 @@ BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 Recommends:     %{name}-lang
 
 %description
@@ -64,7 +64,7 @@ Bomberman game.
 %lang_package
 
 %prep
-%setup -q -n granatier-%{version}
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -80,15 +80,14 @@ Bomberman game.
 
 %files
 %license LICENSES/*
-%dir %{_kf5_configkcfgdir}
+%doc %lang(en) %{_kf5_htmldir}/en/granatier/
 %{_kf5_applicationsdir}/org.kde.granatier.desktop
 %{_kf5_appsdir}/granatier/
-%{_kf5_appstreamdir}/
+%{_kf5_appstreamdir}/org.kde.granatier.appdata.xml
 %{_kf5_bindir}/granatier
 %{_kf5_configkcfgdir}/granatier.kcfg
-%doc %lang(en) %{_kf5_htmldir}/en/granatier/
-%{_kf5_iconsdir}/hicolor/*/apps/granatier.*
 %{_kf5_debugdir}/granatier.categories
+%{_kf5_iconsdir}/hicolor/*/apps/granatier.*
 
 %if %{with lang}
 %files lang -f %{name}.lang