diff --git a/kpat-21.03.90.tar.xz b/kpat-21.03.90.tar.xz
deleted file mode 100644
index 08c6172..0000000
--- a/kpat-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eea4b68aa882fdb4b3561c6be4c21df7a4826e6656739836808e70c38a743ebe
-size 3648824
diff --git a/kpat-21.03.90.tar.xz.sig b/kpat-21.03.90.tar.xz.sig
deleted file mode 100644
index 7a4866f..0000000
--- a/kpat-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCr0ACgkQu0YzUNbv
-Me/2gRAAlMTh5oYnc3X0kYg9LBLbpFuTvAO0WLXLZ0VKCn4t5lITJ/2gJxy8GD5h
-sgeu9n7UBv/TZDKSoQLZ2VBvaYkbdmbEstn5WeRb+soPRXrvb7pemBPOvFJJcfpY
-CbXVSxVfGaFOXJgzY75schS0XUxW4GbtEgYqf7PgGsX0yzmfmYmwY3An/RJVVLfU
-olyDiqwG7IrUhSaqkvwGiiO6786fs+jKVB9wCfc3GwGyMxw8Cq1Hx6XAt6Xcbg9n
-zB1SYHaK//sucN9i4DW8aUEpFdLBU5p9mgf79YDvbrJWIClbh8HEuuakUplk67YC
-Smm8zdHuEwJput+rHYJao8RR+rSsp7HTItd9/Rg8TxKqX82u+UurIf+dVYBoR+jY
-CNSfF0Pi7u4TmoBZSVSEUu5Dz/Aj1Dq8666EYV6G8iM7ddUozz6NQBYIQSu6715G
-+qEagKN96Gxe5V9Rtl4reIs4YcWIXzZU097L+WbYw3dNNTjwE6HU3iMCWDvwdbCZ
-UJcvR7vz6Sd3f8tGHfe0j8uFEAqLgz5oMcl8hUNVyXTUqkcKrs9tTHf22pHMEp4M
-PHXoL8bF1ZXfNPFmnyIh8bp6EiGlAHkzhpidfqWeJOnA7BedzGoKChjaCwjAkVj3
-RMYTUI/VUy228a3VJDLKMwvuh7MIRWzeLT01WmsNBnaxyqSyNN4=
-=y8gK
------END PGP SIGNATURE-----
diff --git a/kpat-21.04.0.tar.xz b/kpat-21.04.0.tar.xz
new file mode 100644
index 0000000..7e74f4c
--- /dev/null
+++ b/kpat-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d645882d8de0e5ec6c79e01f13fef258553e1d59bb18189b6888cd5276bb6a10
+size 3648792
diff --git a/kpat-21.04.0.tar.xz.sig b/kpat-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..52d607e
--- /dev/null
+++ b/kpat-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwEACgkQu0YzUNbv
+Me94Nw//ffyNWdeSA1MElZ9mAOomWG3FZw+liggpzQTMBCrLTxxV8VYoexSIdIo8
+AHzK1WJ+dn7z/42vi2QwPkIKAy2KexZGbOyBGM3bQizxjOTIX9JXpdCGNU/cU5Kt
+mkx9K0BYNV+huNvfiILUqQQDmdTdRtyu07QaUqVJ+GdB/gD9drCOm+IPHtaGnro+
+hlfCvdoDZpcFsy9jiyG6fT1mXeHi3C3w7II4r+iRG7qJVlb7osOVtwK0hO+y7mFs
+ciXLFJwHAaMhbtJbReUWCk4k6tVOzKScu8uRtUkP7XqAk41xH5CTwlo+1hCIL/9d
+NfkLa4hELP5bJEH9IuPFaJMQwO3hf0XO45lH/1Vk7ZKi5Lc8y6Ah/Q9n1SDDIiqr
+0119TXvq9uynjWZYoR3/GkNgfeOv2P4zhv3qNSZr0RstuOefBglpmmEoZa80neZn
+4e7EZMONEpV8YE04Swp7rJ/sqVqjGgrSaDfffDjrXREU/BzEpDIQ6bYE4r7bHlkn
+JMKDMAgUlc+/DKYmdCb5UGlGMhbMnNZbkOUIKm3ZFBh7Wkpdiw7SJLOtQTmwjPwd
+zRLLKOWSTElOTLv5k1YLEZxhsggS54faSlZsVIBUUwe6fQ09XKjZqlS1kbtpDx6z
+7xj2qcfUokkxocwfcuC9t/8A0dK2bneFSwp2/28T5ziHkbsSjvA=
+=WkLg
+-----END PGP SIGNATURE-----
diff --git a/kpat.changes b/kpat.changes
index 55d2268..10ff9a6 100644
--- a/kpat.changes
+++ b/kpat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:31 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
+
 -------------------------------------------------------------------
 Fri Apr  9 17:40:57 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kpat.spec b/kpat.spec
index 94912f4..7c47b52 100644
--- a/kpat.spec
+++ b/kpat.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kpat
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Patience card game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Board/Card
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/kpat
+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:  freecell-solver-devel
 %if 0%{?suse_version} > 1500
@@ -62,10 +66,6 @@ BuildRequires:  cmake(Qt5Widgets)
 Requires:       kdegames-carddecks-default
 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
@@ -76,7 +76,7 @@ more. The game has nice graphics and many different carddecks.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %if 0%{?suse_version} > 1500
@@ -96,26 +96,25 @@ more. The game has nice graphics and many different carddecks.
 
 %files
 %license COPYING COPYING.DOC
-%{_kf5_knsrcfilesdir}/kcardtheme.knsrc
-%{_kf5_knsrcfilesdir}/kpat.knsrc
-%dir %{_kf5_configkcfgdir}
+%doc %lang(en) %{_kf5_htmldir}/en/kpat/
+%{_kf5_applicationsdir}/org.kde.kpat.desktop
+%{_kf5_appsdir}/kpat/
+%{_kf5_appstreamdir}/org.kde.kpat.appdata.xml
+%{_kf5_bindir}/kpat
+%{_kf5_configkcfgdir}/kpat.kcfg
+%{_kf5_debugdir}/kpat.categories
 %dir %{_kf5_iconsdir}/hicolor/24x24
 %dir %{_kf5_iconsdir}/hicolor/24x24/apps
 %dir %{_kf5_iconsdir}/hicolor/256x256
 %dir %{_kf5_iconsdir}/hicolor/256x256/apps
 %dir %{_kf5_iconsdir}/hicolor/64x64
 %dir %{_kf5_iconsdir}/hicolor/64x64/apps
-%doc %lang(en) %{_kf5_htmldir}/en/kpat/
-%{_kf5_applicationsdir}/org.kde.kpat.desktop
-%{_kf5_appstreamdir}/org.kde.kpat.appdata.xml
-%{_kf5_appsdir}/kpat/
-%{_kf5_bindir}/kpat
-%{_kf5_configkcfgdir}/kpat.kcfg
 %{_kf5_iconsdir}/hicolor/*/*/kpat.*
+%{_kf5_knsrcfilesdir}/kcardtheme.knsrc
+%{_kf5_knsrcfilesdir}/kpat.knsrc
 %{_kf5_libdir}/libkcardgame.so
 %{_kf5_mandir}/man6/kpat.6.gz
 %{_kf5_sharedir}/mime/packages/kpatience.xml
-%{_kf5_debugdir}/kpat.categories
 
 %if %{with lang}
 %files lang -f %{name}.lang