diff --git a/knavalbattle-21.03.90.tar.xz b/knavalbattle-21.03.90.tar.xz
deleted file mode 100644
index 58311b7..0000000
--- a/knavalbattle-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81bf3b72fd268abe69dde1c61040af5e60ee16dbcaeac15c7e82cbd680ba42b8
-size 1366048
diff --git a/knavalbattle-21.03.90.tar.xz.sig b/knavalbattle-21.03.90.tar.xz.sig
deleted file mode 100644
index 1bd71ad..0000000
--- a/knavalbattle-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCr0ACgkQu0YzUNbv
-Me+KXRAAhtGQ61c3oV2FpKxx8DEIwn5i0H8Ov0rQ1qaWYmuKiCq7IBDBSxgKBMSa
-smVz6nz5fin/bJKOjpteCAhKp2Dh+GwGi+5B6cnr37bxbetfSai1tY4UaEwEPtQE
-dMQrdonVGTFgwGq5+U2ZH/1EzInh7Rsj6LSM8RJcdJnogYcG/Jxjj3mvA6AIa82F
-fJnvUNdBeEpvqQZM/m6hA23OrsGkOYafOq/mY8AqWH5AJKtwSB9wOiKpl0fFIrv9
-fzQYWnK/88BJcZW9NYrdFkKcXpTxKJSSofVEpcaR8aWSdCOS2kb3EICvn1EvB9qD
-3/ToUXvQ3R2dQuWh6Q/Ezbr9sXH6hI/UGOsXbyCvPXr5JpdRRm5vBMASu6ynC/CE
-uFmFO+11nJp2BcnP/oIripbCNgByTEvcB6pdtrSIbJ/n/0vVbJbbwG3sESR1uE/1
-CJ9OLLTLwI7su80bTLdkEzrmR1JSUB/zMEGquHrkZPow5vxZf+q1kGREwU09Bp5m
-FVL77T2e0ZgO3lj6u4fxtHn4nutN8/JGC3F1xf0bpBLdcJgiPxN4CIbBgqfBQsq0
-5J7ogUXV6DPGexZ8dwt5EaFN7gCj87pf3xiQs9jwnmTtH3KQpi/rBB0NcGl4RrJR
-jGyOHllPgpXYWumrBQ4q6Q21NEp/XTVMg+DI89q4TRL6RAvptDY=
-=irTD
------END PGP SIGNATURE-----
diff --git a/knavalbattle-21.04.0.tar.xz b/knavalbattle-21.04.0.tar.xz
new file mode 100644
index 0000000..b6e8e39
--- /dev/null
+++ b/knavalbattle-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6510efefec72bd90eb9b563cea1ca0226c17d33cb337d62662e692cceaacc776
+size 1366736
diff --git a/knavalbattle-21.04.0.tar.xz.sig b/knavalbattle-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..d487920
--- /dev/null
+++ b/knavalbattle-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5Vv8ACgkQu0YzUNbv
+Me96IhAAl1A+d8blWAXKXMPaI9iWNY46CQ5WSUw+75kTKnTczV265q8hFr9PhdG4
+1JdwlgRxKoEDZ2ZhRcg9QPq7Ora/sI5vapXe0VK68b9xTIuZ3VBZrl/FrzwsT3Ix
+y8K9KysbXynOhCBbk2Go1c60Qjq4xDIPpr7x4IGG4d26HvsID6wVUk7T+C4rhNdi
++3Rim1Ahm+6weRBU7gF0mMGTpznzeGyjm4BLjxC/DA8iCnPnzyyIPp+a/GEPbNzA
+usVRrSLtN3nuyv4orYc4RjaHVjM+eyQE1e5f4HL2ctdILnBNZ0481ZZkWYBw+iPj
+Z3GOLkkM3V4fVfPKv0bIaVxcPsbnm+v1L+R9vYkx924V+JDRIVwnONFC7Zi1ELmm
+rkuytvJgwqQT3jU1tdYcBZQySWN/pOfkVAmKLK1n+sPfqEdeuX68QH42WjanG8Dr
+oaDS8PVIUPrFino/wejphe9TNVkI8F0dEe0vPIgLHTTpJoQcWM2uDLJw+eY5BKSr
+ZWOxDIWTAHM2nSUi5eW2wr9bBqaCWsMu5kXqhc9mClOhgLidcXzWelMMlE9if6D/
+QcCQxVxUH18VBM2bnVPkc9mwun1HmKtCAUpwb4y1QAJiHyaWnWxplRIspfF/dKwa
+aBSiPzaGXpx2OwVVwe0iPDbmE66UY7cx5Y1OuaNjUBNEbnIJSDs=
+=fmgy
+-----END PGP SIGNATURE-----
diff --git a/knavalbattle.changes b/knavalbattle.changes
index 78d61dc..82d2189 100644
--- a/knavalbattle.changes
+++ b/knavalbattle.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:18 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:44 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/knavalbattle.spec b/knavalbattle.spec
index 5d927a5..bc2408a 100644
--- a/knavalbattle.spec
+++ b/knavalbattle.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           knavalbattle
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Battleship game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Board/Other
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/knavalbattle
+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)
@@ -55,10 +59,6 @@ BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
 Provides:       knavalbattle5 = %{version}
 Obsoletes:      knavalbattle5 < %{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
@@ -69,7 +69,7 @@ played with friends online via the internet.
 %lang_package
 
 %prep
-%setup -q -n knavalbattle-%{version}
+%autosetup -p1 -n knavalbattle-%{version}
 
 %build
   %cmake_kf5 -d build
@@ -85,9 +85,10 @@ played with friends online via the internet.
 
 %files
 %license COPYING COPYING.DOC
-%dir %{_kf5_appsdir}/kconf_update
 %doc %lang(en) %{_kf5_htmldir}/en/knavalbattle/
+
 %{_kf5_applicationsdir}/org.kde.knavalbattle.desktop
+%dir %{_kf5_appsdir}/kconf_update
 %{_kf5_appsdir}/kconf_update/knavalbattle.upd
 %{_kf5_appsdir}/knavalbattle/
 %{_kf5_appstreamdir}/org.kde.knavalbattle.appdata.xml