diff --git a/kolf-21.03.90.tar.xz b/kolf-21.03.90.tar.xz
deleted file mode 100644
index 949b621..0000000
--- a/kolf-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c7b6afcf710b8ce03bb7cdd690f83321e35b13cb9431196044cc6a7a9f311f7
-size 1035880
diff --git a/kolf-21.03.90.tar.xz.sig b/kolf-21.03.90.tar.xz.sig
deleted file mode 100644
index b6c7ff8..0000000
--- a/kolf-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCr0ACgkQu0YzUNbv
-Me8xdw//RAYbCgCqMkZvINYWl7ilzuQ3UcY2QzNrEfcjLy9QuQVv5gVIXt0xZg9r
-N4lmCWIBo+rBWSUeEnbO8wa35NmPECDLP0acuQPJNr3zv/0UryKPRYDnymOfrgYp
-9hJlDX21CC6o4E25q71JDK5mNLeauTK5MTvRb7Sw3cc22UUcark5JNb1Hl2cg1X/
-gvaOwYDJKyAfunqIWcKsgCLXq1X+TA33Uqa8rguocLoW37EtypGrS/IL1nz4HBIW
-79Q36iGPJA3VnnqLoeid1QbL4P/J2KSIGC23uQ8wdti6uBbwMVUKut+Fmskn7NfJ
-8JHglo08EoRGDDk1ML6lndOAGPL22KE6rhC8SQ6jUTKnnV8BEc090fd5ZLwpq8xD
-aJ54qD1gWvBnGbY8U0QV/2XAsOGkzQ9X/Vj6jKJDvjyX8jsOxvtB2Qt9O7d7QNEl
-bzqmzE2q2hEDumUUuVW8ByXc/K/GajxKlle4XCLmWqJ2wMBK0Cyo8iYg+jaYEhfo
-tq5Zss/6xbbuJ7AEv58qAApJqPT0gty1W+HiFhK2v67V9Fofu+0q7HfXkVBuIs6x
-WITtPYHADKWTj3kIiuICnOnc/DpwdcHXp5vovglrgb1cuCJ/zofes4T5CQ6zi7fN
-KLGU+h/FZ6cpk3ApgM8UIe9XSyRqxEz9XK0MvXhcYGY9wTjWOt4=
-=EqOL
------END PGP SIGNATURE-----
diff --git a/kolf-21.04.0.tar.xz b/kolf-21.04.0.tar.xz
new file mode 100644
index 0000000..8693447
--- /dev/null
+++ b/kolf-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98b91f596f95899ed65133c2478c0396a2decc49117e3dee6167c1bb2a594008
+size 1034140
diff --git a/kolf-21.04.0.tar.xz.sig b/kolf-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..c6112f6
--- /dev/null
+++ b/kolf-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5Vv8ACgkQu0YzUNbv
+Me9zVQ//ViBvMo3qjkH7NxGbSFwopAHFM7trrF3lh+X5eKjQRvJ1FGcDaBci5TaK
+Q+zN1kQOqR9PBq195y6B4pJLWfXRI0LKHuaClkirgsPeJZMn3tvgKtebm0hh7x/q
+cdgKXx6dCHhsjKQ7bkOwDqTZyjShGHeNXsMyy32RB4sdxSkFA5UD6U9xFnEclqSJ
+w84KtZSVCPfYtt16iZVFX2bdK+fhQQtHm4Za48bTyFhmo/e5n9pzMFFf2EQx4JRk
+2n1KVrdHPFZ0pdVIMMKQM5TrOn+oh5p4PMJRSgeEhl0v/zZo+wPfcq4tcA3KLddP
+tMuWSrObr1wlmCskFMdVFRi3gyfdTRRq0LxixwQFdz8i/sYGnsERSX99PPvL1FlH
+eGu9WIY4OAwO5nPp1Tb6ntfGA0lnzjG4VRzELiFY9BaR3Ty6R4QQtpmYqtZbJiYf
+zAxJs+qOnnJk39ERFnR5SiCI5914rRUDptEYM7Y876imgwR2FGTHmfud1BS2dPOc
+168LUIRL7JAO2H1g8518Gbrv/T+9k+59s8w/ZnnMm769VrxK8F0M1xyK3f5yXmc6
+Hb0kZXWpGNOKRCUBt/XopiKxZ7OZSKcPkfLPVVdtzo+fBHgFmxsELGKm0WXo/0IO
+cAYV04T+ScU2TwBZFLZvP3YLSsPVQRY1mvB3HngmWWsJJW7hYjE=
+=YXiZ
+-----END PGP SIGNATURE-----
diff --git a/kolf.changes b/kolf.changes
index 82ec186..7bd9f8c 100644
--- a/kolf.changes
+++ b/kolf.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:21 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:47 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kolf.spec b/kolf.spec
index 1e99139..0993722 100644
--- a/kolf.spec
+++ b/kolf.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without	lang
 Name:           kolf
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Miniature golf game
 License:        GPL-2.0-or-later AND LGPL-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/kolf
+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(KF5Completion)
@@ -45,10 +49,6 @@ BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(KF5XmlGui)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5Widgets)
-%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
@@ -57,7 +57,7 @@ Kolf is a miniature golf game by KDE.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build