diff --git a/keditbookmarks-20.12.3.tar.xz b/keditbookmarks-20.12.3.tar.xz
deleted file mode 100644
index 07d892b..0000000
--- a/keditbookmarks-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6823446698d80e6ce59601f1772ec316ad205954cac8be6381456f714c6dd759
-size 191892
diff --git a/keditbookmarks-20.12.3.tar.xz.sig b/keditbookmarks-20.12.3.tar.xz.sig
deleted file mode 100644
index 424ee31..0000000
--- a/keditbookmarks-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEEACgkQu0YzUNbv
-Me+JTA//W/0bNE6JDwyB7aD6Zp6ot0LjrwMWvyPVVEdwvsMZl+Z34cZmFdQOXjfv
-Iq/1eqT+uoXywszvPpGG7w6MigFCPGt6yLmfrBBAf4uOgFQH9ZW2oevfR+7vmiBE
-bXuk37/uJcJHRiBLxLJmIkEzI3zfzg9QwT/nox9yI2UrVuCRjMn1NIn9d2oDh4uJ
-4fZ4atuZ6zrxTApUp6Zw1W+i+ODaokKuO5VFhoR3AXLVqM7ypQ/iVfcE7o37sbmP
-TDUq/vNNYbwIiZDPk4JJHSzWHmwFw8GIYQNvxTAEe/bUy5pfVeHZDrzUgvpBbreb
-DK1CZp6//mfO8uFgnul/MRYpTs3iAktHBnbCNYxQX5bJJkoCiVYf4kbZKWop4L/4
-cFGuyj4SQgtah2SHkpehmXj1X4tALr0T91TlK2WhO/hhTYtW/Yr5BUWZSabL4LnE
-ccJbFv3DFHVVb8lD+lReIP5xT/S9Q7Xu0zietltke/t9cXPVxtgsFkCPYT53Apdz
-WPl9udmjd/SzIMvF6Bm6uEVNnzghBOH230VPHh7HZ73WdvFKsatwQLx+yUr7xNqX
-kiaJVkzAQhSHXCvfBZ/N9GJHnJvUds4ym21ClXo0Zdh0rfQRiHZojNhA0QGu+JTq
-5jvE0vrNO4FoMUOHTqwWoRKicg8JB1ccsWHUScp2uyNi8VlFS48=
-=BF55
------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 e5a1503..ad070c2 100644
--- a/keditbookmarks.changes
+++ b/keditbookmarks.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+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/gear/21.04
+- No code change since 21.03.90
+
+-------------------------------------------------------------------
+Fri Apr  9 17:40:15 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.90
+  * New feature release
+- No code change since 21.03.80
+
+-------------------------------------------------------------------
+Sun Mar 21 13:27:59 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Run clang-format
+  * Add clang-format configuration
+  * Use directly autorcc
+  * Port foreach (deprecated) to range-for
+  * Remove redundant setLayout() call
+
 -------------------------------------------------------------------
 Thu Mar  4 06:10:16 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/keditbookmarks.spec b/keditbookmarks.spec
index eef9cf0..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:        20.12.3
+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/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
@@ -39,12 +43,8 @@ BuildRequires:  cmake(KF5IconThemes)
 BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(KF5Parts)
 BuildRequires:  cmake(KF5WindowSystem)
-BuildRequires:  cmake(Qt5Core) >= 5.4.0
-BuildRequires:  cmake(Qt5Test) >= 5.4.0
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Test)
 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
@@ -79,7 +78,6 @@ This is an editor to edit your KDE-wide bookmark set.
 %{_kf5_configkcfgdir}/keditbookmarks*.kcfg
 %{_kf5_debugdir}/keditbookmarks.categories
 %{_kf5_libdir}/libkbookmarkmodel_private.so*
-%{_kf5_sharedir}/kxmlgui5/keditbookmarks/
 %{_kf5_mandir}/man1/kbookmarkmerger.1%{ext_man}
 
 %if %{with lang}