diff --git a/kajongg-21.03.90.tar.xz b/kajongg-21.03.90.tar.xz
deleted file mode 100644
index cfde1ce..0000000
--- a/kajongg-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:784563cf73c0b60046d8dc56c417c10da795eaec8efb71c3a5afcb8d4c48b448
-size 4472956
diff --git a/kajongg-21.03.90.tar.xz.sig b/kajongg-21.03.90.tar.xz.sig
deleted file mode 100644
index 0bdd659..0000000
--- a/kajongg-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrkACgkQu0YzUNbv
-Me+/Wg//fvzhl7uRKs5EViWMvG+NeIvTBwqLEzCq8QhaeFE1O/T5VDqmsQZjuNd4
-fR0BwMbJbSLYLHbBLPUBhk+OnPBM/9utlrNMODZg1b0kBrUXTqpluyS+Hr5nYGyB
-dpJnOJe9qmdEDoZjm5E4wOhyRY6bWoCAfk8NrVHe7XAAwVDy1JJ3JqHatnCA2uNC
-6umaE1XFCl9hIY/GaeTU9ZyxS65u38Rxpv20AOAiovkbsPSJxDm2tVpseut9YQJg
-ILXRVkxMOM/VxKz77UzJ9Po70VNaEd9vl/Xa118eh5rQJdH/P5yptI20LGkIFcBH
-fCf2mz+xzs7WPA+QR+F3TqJmOaCZQEeqqJkm8DkNoMSX5bctFRLnQiqKhzvEiOu0
-qQtTP+Q9IffTand0G+QNGyOlLvTqo03rFuTTXuwkixPyfo4nDQmRDycCkU382VlX
-AgBs9MaCHSnzb7NgVJJ1RFOCoWzMsPsv+GJr+v37fVYhRJIFUKsljUqvYIw25+pu
-/fAKKgh2UMs6TtvyTsW6RMzMpPnzASMIK5joLeVfrbEv9nn/YLdtLO3OcshmThEp
-jHIAaBoGWNafroJoLJZwwTrcB0n5Yd6ZPrv2vXTbH3+eeP4OcO4kQH7D/fjam3NW
-GG1XXvOBCbA8y7/BV8GT1z6L64FeqUxxI00tPu6y4THcOwApjpw=
-=FKcc
------END PGP SIGNATURE-----
diff --git a/kajongg-21.04.0.tar.xz b/kajongg-21.04.0.tar.xz
new file mode 100644
index 0000000..ae3174a
--- /dev/null
+++ b/kajongg-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b638178fae8b0c393e4aaf3afb727909d817d91edf8c5378fd001cc634601d86
+size 4472996
diff --git a/kajongg-21.04.0.tar.xz.sig b/kajongg-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..b33a9ed
--- /dev/null
+++ b/kajongg-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvUACgkQu0YzUNbv
+Me8arA//QQU9TIXAHKjl/tANkNLQBNoyYZNuGZnoZoOmgCi3rrQ/m6PmgBL4RB0f
+xAr0lO4WbvCkcho5ljy2kRrE79gnt4aaWRjDB0g8WkUrMHbz08/eKUjfA88QnAah
+zjF4vHeyjqud/t8SZOWu4rO0ubKWr5MGEDYcFf9tg55iQJlt6pgntaKloDKeJEV4
+v0ZAmut/RHRpria/ItfFMWUKpbux8bWbXpKqefaoxIc8l6T8nb2zmVzq2g4GvPNi
+5B73bAH01AHznVotRV7HffmkrBTV6ddcccYVLbF7+qRXDNARnHkM7eOH+siOf2Bv
+9GEQwmIrFlPMVuTw6WW9m29c+AXrDRO+SugY/hGGPwGO8PDmnw58lXqUPJLgWD5Q
+owOk3ISZoMj0EN2FlYd4vCJB6/sXftdvMxkIo0PC8kz1aN5ekgi0omDN/M/Sz606
+YJ75UCnlkpwNmfW5OUGSIGGCAmbIALWnMgq/qgUjwWuvNgfpIPIlupNqk5vbXUg1
+uChWeNqFVFlirqPlHrPUHCVZ3+595vYh3yj5nCShmOmF64hthhZ6Y5erzwzLV0aN
+q70kW5zrTR1DhCZVe4unItEjh7m553LUOlW3F8YqMH3UH5VWinuSSITPnVIeq1gc
+QYU05VIyJvjQW6qFvvNyIBLnjm0qjWUy4KVGcBKjDi/oyKkGAcg=
+=D4+J
+-----END PGP SIGNATURE-----
diff --git a/kajongg.changes b/kajongg.changes
index f49b376..6221fef 100644
--- a/kajongg.changes
+++ b/kajongg.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:20 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:47 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kajongg.spec b/kajongg.spec
index ecd8b72..46d9542 100644
--- a/kajongg.spec
+++ b/kajongg.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kajongg
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        4 Player Mahjongg game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Board/Puzzle
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/kajongg
+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:  python3-Twisted >= 16.6.0
 BuildRequires:  python3-base >= 3.5.0
@@ -46,10 +50,6 @@ BuildRequires:  cmake(Qt5Widgets)
 Requires:       python3-Twisted
 Requires:       python3-qt5
 BuildArch:      noarch
-%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
@@ -58,7 +58,7 @@ Kajongg is a version of the four player Mahjongg tile game.
 %lang_package
 
 %prep
-%setup -q -n kajongg-%{version}
+%autosetup -p1 -n kajongg-%{version}
 
 %build
 # Workaround for kde#376303
@@ -82,7 +82,7 @@ export DESTDIR=%{buildroot}
 %doc %lang(en) %{_kf5_htmldir}/en/kajongg/
 %{_kf5_applicationsdir}/org.kde.kajongg.desktop
 %{_kf5_appsdir}/kajongg/
-%{_kf5_appstreamdir}/
+%{_kf5_appstreamdir}/org.kde.kajongg.appdata.xml
 %{_kf5_bindir}/kajongg
 %{_kf5_bindir}/kajonggserver
 %{_kf5_iconsdir}/hicolor/*/actions/games-kajongg-law.*