diff --git a/keditbookmarks-21.03.90.tar.xz b/keditbookmarks-21.03.90.tar.xz
deleted file mode 100644
index 997554a..0000000
--- a/keditbookmarks-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bfb11273907220c5da1f5e045be2a86689fdee22cd85a83da3dbc31b0db67a4b
-size 190584
diff --git a/keditbookmarks-21.03.90.tar.xz.sig b/keditbookmarks-21.03.90.tar.xz.sig
deleted file mode 100644
index b83fd21..0000000
--- a/keditbookmarks-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrsACgkQu0YzUNbv
-Me/cHg//YaOji89WG5Ism4UUU3P4kXshtUukMjcDc9Q7Hx1F6JGAbyz9D6CO6aX2
-TvgSyCxF1N841nGryNfSBWKD06YHjmNPL1vxx1bj+SzTkzNMa3cA64ryjglCefrS
-PcZg+lws58D68rj1OJ2o1APiWjCC50irIkkSj1UFDUU2cwiwGroN0oshBcSqHTwK
-dIEb0AcCX33VTt7C0ZlJYYEJ8ZNbQSPk/9U+S+xHDEn5uQz7UipyobFLOtrMC1zY
-zxu4BB/9VaSKM/c7imOLj6sNrSIfg8P18QmGfxv7pvaLyMkOT5aZd1aM6k5+6lzY
-hex+SfSUJ6f7aHJkHP2xxDaD69VeubmM6/BiaAVn0iwymwAy4eR9ufPzFfAYF06k
-Sw02K8yWBjVrpEpwPKHyuudGcWUKdINIOmGebZcJHoyKaS/iFrFfW/VW8e1KkAjV
-wjI12ImCSyuJt01kpgN6ycKAVGGYWN17bG2rXJWoNePn6xGR7ipflHLL/ZAj3Q6S
-EpW0cDhkl+zhZzsFMQWoik00k5xlw7TCLklxz3+3ZFHCBcaSrQgzdLvpNcia2h4B
-NGQYp6fJUk+UfuW7570j7TAtoEcfL726urQkubf+QD3v9I+B+9ExC+Je495LqH73
-PbQYABq1qtavVybp0mIHBA1e71pdG4lXztBmK50jNZ5gvourFe4=
-=bbJa
------END PGP SIGNATURE-----
diff --git a/keditbookmarks-21.04.0.tar.xz b/keditbookmarks-21.04.0.tar.xz
new file mode 100644
index 0000000..b49b048
--- /dev/null
+++ b/keditbookmarks-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c9e69198d3351eef02531562a53ccef6e6781af95ea9cb7d0b49e07d313b3a9
+size 190600
diff --git a/keditbookmarks-21.04.0.tar.xz.sig b/keditbookmarks-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..324c851
--- /dev/null
+++ b/keditbookmarks-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvoACgkQu0YzUNbv
+Me/QfQ//aYk4iFkWmF4vO6IKbze5tchUicE6DO4Cm7ff42aEsDfuDVRCZIlzX1WO
+qFGBBUyLTVk/uuyb7TVQPLjpPHVHbVswwKrTVDXc+ZZnrk5jA4w3trenNWsikhAd
+JKxj0spPolROvnFLvtw0i2TdhN5rehJVQdnUNOee+b5f++P7Uf4/8tg62+BUhGWJ
+GdEvBzIZ/I3WwZnNx2XqkosJRPeVrhc+1L5Jf5c1jEK3E+uCpErVkFU4BmlD8iOy
+CCfNd3WM3NUV5akwsiCDGoehsYQyJPRDTivyOOddihsOPClnCs+7F8d/9Eee6aDR
+2kL60e1zQ9E23zRoYovEjejtFUeAIZIZ08mEKmMBg2qmy1elW9RlCPTRGVU/WlJS
+w3sgq/4/TWsSQMaF2gJjURsVcmgJsB1EvlMFSd5ZU2fpBaN1mY+LYwkMGk2RdUVx
+VtCiuEPG1MQAwpRuDuMj4TCkobReKnEmCJar9w9aHmMNdodD1D2akDm6UxF+hoNk
+PqH9eTTvjpSinoCo0YUjNxLwWM5AoO2JtoLMCbRurMUhM7Mrf4zLOLOJmJBuyQWy
+VKLZIc8bwFbgTHLpLuLZdhQuVsNAf39UffHIgB4CVjK0ngdMGFKZsUKDbIx4de2s
+0l6M2gv0yc+bLvHo3VPw5vjDfUuEg3V6sB1BjZ0H0aDhtDuAbDI=
+=F366
+-----END PGP SIGNATURE-----
diff --git a/keditbookmarks.changes b/keditbookmarks.changes
index 28a7001..7be3571 100644
--- a/keditbookmarks.changes
+++ b/keditbookmarks.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:48 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:15 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/keditbookmarks.spec b/keditbookmarks.spec
index bc79734..83b31e9 100644
--- a/keditbookmarks.spec
+++ b/keditbookmarks.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           keditbookmarks
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        KDE Bookmark Editor
 License:        GPL-2.0-only
 Group:          System/GUI/KDE
 URL:            https://www.kde.org/
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+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:  kf5-filesystem
 BuildRequires:  update-desktop-files
@@ -41,10 +45,6 @@ BuildRequires:  cmake(KF5Parts)
 BuildRequires:  cmake(KF5WindowSystem)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Test)
-%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
@@ -53,7 +53,7 @@ This is an editor to edit your KDE-wide bookmark set.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -71,7 +71,6 @@ This is an editor to edit your KDE-wide bookmark set.
 
 %files
 %license COPYING*
-%dir %{_kf5_configkcfgdir}
 %doc %lang(en) %{_kf5_htmldir}/en/keditbookmarks/
 %{_kf5_applicationsdir}/org.kde.keditbookmarks.desktop
 %{_kf5_bindir}/kbookmarkmerger