diff --git a/grantlee-editor-21.03.90.tar.xz b/grantlee-editor-21.03.90.tar.xz
deleted file mode 100644
index e7c4f8f..0000000
--- a/grantlee-editor-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db9117a411d309048e77c444074ea3aa6d257e0cb7387bd9b2ae3c4f21d08b36
-size 111708
diff --git a/grantlee-editor-21.03.90.tar.xz.sig b/grantlee-editor-21.03.90.tar.xz.sig
deleted file mode 100644
index 279bb08..0000000
--- a/grantlee-editor-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrkACgkQu0YzUNbv
-Me9urw//cy5R971rKEMVeKYWRDwYbyquX1RQjf7zUc8rAGJdHBzGGno6D094FNYu
-++2shmEwnxUHXpPYyMtNMqmfmU3nyJzExIzaNIVT8DQni53iFfT1v93PJpnTngrv
-E6OtQE3D7OZftuY/TzcHtJCbQFmE9G8mMwNkjnCSKc3uNs8gTa7KCQ/UOQVCJd7j
-7ydv3+/BInoIUl0bpguLvcy9+xXMlBuBrkJGTTA+VGTxGrzVPoIwNET294olvuI/
-R3pGEavPTtqq4hVFiICrOoP3A+jcud1dHMo78hfE85EE87LIFpymOZDm4DUS864i
-FqDpq+ICjFP2CKpbbdgPF+nOVtb5/lRBncQ+yyAemwDhMcBNa+Me3KcT1gGqyHLa
-x/wJeCIUrz4bDi1lrtjWXLcxXuhKNWlhY+ClgTpIpvoymNBZfYgpQ8WiCDTnkJ5A
-UANjJoT3AaJtlUca/zsvn0+4gYJ3PI5BhmQI5yF99gpSXkk6ccgkYzJxPGPLpCIQ
-hfhIoMhya3wzKNaWCo3eBhaTuxIhPdsZp78uyD8VyvxnVaqBLyxUQfBEZFuBanj4
-RAnqjbdav0WxekxkXedORilLNPULl+ie7VwWJgqLxWrUKLr+gzw5NU5XY1YUD7P0
-UMt2ChQEw35gvopeO/IPNQpQYxDqnrYqsoBMPGxuR1ruEyCUKF0=
-=Ni/c
------END PGP SIGNATURE-----
diff --git a/grantlee-editor-21.04.0.tar.xz b/grantlee-editor-21.04.0.tar.xz
new file mode 100644
index 0000000..8cf2c9a
--- /dev/null
+++ b/grantlee-editor-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d708a102dda808d6b7983b574b230b35d20d07f9f5fc8e19fbb170ea86d9cc65
+size 111752
diff --git a/grantlee-editor-21.04.0.tar.xz.sig b/grantlee-editor-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..c320e22
--- /dev/null
+++ b/grantlee-editor-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvMACgkQu0YzUNbv
+Me/TfA//fkPNayzULJvQkUs5QHHntnYBUDWKmUs2fDNJbMMW9CwAXcs2scJxP/QK
+u3SbNJtST9nvhNEKK/yVJHxPiFLp6F534tqj+Ob6m3AxGytJPXOATZv+0tAKcBcN
+LV3uaq6N90bGnr7KVTga1rdMRqbsrzpp68EYD64rmya0zMFHAR3ya542un2rZcZb
+PqmsOGcJtCMOXu5xhXgWAhKk3wRRg0s2rxiBizKsgX1y3qub99BYLNA5v7Lu+Fm3
+9pWav+u8nfNEaHRWNe+easv2WRp/qSRqu0F4fDQcdR9ylScGxTBEu4qwxs5SmVR/
+4nC9+cT+ulC0SkEVcoqtaE5e8SIG5/67drZwol3sL41moqk5XhyUx2tLDsYS4Tcj
+2OzeZpmlln0AUmkGKimkJsFIWFBV19WRl6+RL/y+5/zhepxhAlcbfuO4VHPPbZSO
+ydFLO287Ay2lcTO2SA1/Z8JlkJuTpjfOgJw1CoYcrm6Y9AhgbR200mPo8tR5vksz
+Z0udJUmUice+fv+BSh/EGIqQhSusd6n79g7OnooBDD6af1L213ns3UHjPsoCDK7+
+vGsIOIAcY7vj1ApkHdelzWqeykr6Y9UE8euC9mhQnNOP2fAFKIa7cTm/6LAMWeoO
+pSjS5TPY0J5+HUvt+gotmZsyMqoTxHyDvssJHerQsrYaCy+fvDw=
+=Up/2
+-----END PGP SIGNATURE-----
diff --git a/grantlee-editor.changes b/grantlee-editor.changes
index 646ad11..c61d68a 100644
--- a/grantlee-editor.changes
+++ b/grantlee-editor.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:13 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:39:39 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/grantlee-editor.spec b/grantlee-editor.spec
index 2b74678..9537485 100644
--- a/grantlee-editor.spec
+++ b/grantlee-editor.spec
@@ -16,18 +16,22 @@
 #
 
 
-%define kf5_version 5.75.0
+%define kf5_version 5.79.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           grantlee-editor
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Messageviewer header theme editor based on Grantlee
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 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 >= %{kf5_version}
 #Only required for the icon
 BuildRequires:  kaddressbook
@@ -54,10 +58,6 @@ Requires:       kmail-application-icons
 Recommends:     %{name}-lang
 # It can only build on the same platforms as Qt Webengine
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 mips mips64
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 A theme editor for messageviewer based on Grantlee. Once created or modified,
@@ -66,7 +66,7 @@ the themes can be used in KMail.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build
@@ -85,17 +85,17 @@ rm %{buildroot}%{_kf5_libdir}/*.so
 
 %files
 %license LICENSES/*
-%{_kf5_debugdir}/grantleeditor.categories
-%{_kf5_debugdir}/grantleeditor.renamecategories
-%{_kf5_bindir}/contactprintthemeeditor
-%{_kf5_bindir}/contactthemeeditor
-%{_kf5_bindir}/headerthemeeditor
+%doc %lang(en) %{_kf5_htmldir}/en/contactthemeeditor/
+%doc %lang(en) %{_kf5_htmldir}/en/headerthemeeditor/
 %{_kf5_applicationsdir}/org.kde.contactprintthemeeditor.desktop
 %{_kf5_applicationsdir}/org.kde.contactthemeeditor.desktop
 %{_kf5_applicationsdir}/org.kde.headerthemeeditor.desktop
+%{_kf5_bindir}/contactprintthemeeditor
+%{_kf5_bindir}/contactthemeeditor
+%{_kf5_bindir}/headerthemeeditor
 %{_kf5_configkcfgdir}/grantleethemeeditor.kcfg
-%doc %lang(en) %{_kf5_htmldir}/en/contactthemeeditor/
-%doc %lang(en) %{_kf5_htmldir}/en/headerthemeeditor/
+%{_kf5_debugdir}/grantleeditor.categories
+%{_kf5_debugdir}/grantleeditor.renamecategories
 %{_kf5_libdir}/libgrantleethemeeditor.so.*
 
 %if %{with lang}