diff --git a/akonadi-21.03.90.tar.xz b/akonadi-21.03.90.tar.xz
deleted file mode 100644
index 330802b..0000000
--- a/akonadi-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbe181c8315abb480a90fb4ba5a639e73f3baaf5b45714becd627eb81b83644c
-size 1598664
diff --git a/akonadi-21.03.90.tar.xz.sig b/akonadi-21.03.90.tar.xz.sig
deleted file mode 100644
index 5fce5f3..0000000
--- a/akonadi-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrMACgkQu0YzUNbv
-Me/jXQ//QivwEOjAwQj67pJSyeuSUQJZRRHxSpPFgQx0iDwvSm0XoSazZe/+9ZvW
-DCQc1T/EzTyEDzUcRrF7WE4f82ZT3rNQnRScOqmyDDbMFOdGofxbZZru6Q6Up9w+
-ctzqOrDpHdtDUtFMHW/B0LaJSjsTJJgD+D+hNCP5AbNG+I5CUqL/kHGpbFrjna3A
-IPO2nF3s2Wt8VoP42kTRgoJaIPBjVDo/ktoD//SZjwkyboTziMHIDhpyfouD3UY/
-AB5Joo67gfMfzeUfzEJx9yKu4i2DqWP5RnaSEpiikgIuzl4uSHExF/3dZbgGO7DZ
-Dn+62Nks0j9r56Punov/LLn/VN9ui//DMNvILqjbwMj0dCPGuomGdAqg5jH5ZyK0
-7NtUGd8cmMYZ6URhIkyr1MNNWBMvUIlbEU9T6uyQtxxceQzN8CUMH1mUlBQLIE42
-pJ9rIvxpGmWlUpbbutd4LfamiIlZSsG7xVppGW3S/aiqc3HML9LREcPCRfyVmjtC
-9z+IJicrXk3N5sd5IxeZdUJTbr+QaMKmRUBqD92eC0Gq1itARFkkKpYFkSoy4S7O
-+pHe5pHeQAGvfaTpnjIDY3Gg8wJ7BaChfLwdauQy/ZSFk/EPVuijgOjkaPj/OsW5
-WHjlRxw8sD7Y6nJYmA0Bf9Q5OEkrOlAFxDW/VUYb5jV7dNdLKtc=
-=Y7Ix
------END PGP SIGNATURE-----
diff --git a/akonadi-21.04.0.tar.xz b/akonadi-21.04.0.tar.xz
new file mode 100644
index 0000000..1e09c67
--- /dev/null
+++ b/akonadi-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fb7424fe9096739780bf87391509fa1259d59de679f1b62f2beb18d796741cd
+size 1598612
diff --git a/akonadi-21.04.0.tar.xz.sig b/akonadi-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..12634dc
--- /dev/null
+++ b/akonadi-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VuEACgkQu0YzUNbv
+Me8XXA/8CSvSl0xjtiC/3cvGui9+zlAHiMR5s9tNApGYPjApJNodtQ1G3k2sFnBa
+W2dMSbPDbDYhuIC4LpKRm9Or3iR4aDUo4IqK9cf1Y510Y/SFF9YEHcRF7/hvBSsO
+fVrOhpne8IeQn51G/qBWgfo8PJSemanY4tuShIeG4rg5EBiiLy2KPk+h3jSJsnuI
+esVY0XpBpl28yTsZe5ZG0BwfxqBVl4AZCKANGM9Jfu2obpZMs3IoD+2wfTS91LXu
+EyAG6kZ8kq2sTMOF6fi+ddOD8FjSUSyKB70Sq1tsW4lnSFdVZrbj/HspAZRXuxwZ
+GGm8dnh7PFHPykG7W4JE/QbPfZ0t5ngPqZ99HUzdTwInl1Qi0GCmFf4fRrq1sFuE
+ajbzHqYEZsglqmADkZz3APpX/spkvjFtBv1omqB71c97MrwJCqaqu+VVfZlj2FK8
+b9n2LFvrHgWRi2lzfdZE9DM/DrcXs7h6LuniDWLJf3la/xXEUDA386qZCy6HY167
+nshizPhApDsq0Af1vatNLdcLvZ8HriFW4WshgSGz7/qVePMnKw7KitnYC9K4M3u4
+1JZueZoOrCjBTJ1jIT8vntq9a3kWaBjqZrG6eyh+SbBcq/vUnQeeDx24pvqW76yg
+bx9q4ExgALjXW9N/JCuF9VjqSHth4HzzRB6XC5V+/XOVE1Il8A0=
+=732W
+-----END PGP SIGNATURE-----
diff --git a/akonadi-server.changes b/akonadi-server.changes
index 040c937..171acef 100644
--- a/akonadi-server.changes
+++ b/akonadi-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:10:52 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:19 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/akonadi-server.spec b/akonadi-server.spec
index 7bbd28a..ab40dc5 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -17,18 +17,22 @@
 
 
 %define rname   akonadi
-%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:           akonadi-server
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        PIM Storage Service
 License:        LGPL-2.1-or-later
 Group:          System/GUI/KDE
 URL:            https://akonadi-project.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
 Source99:       akonadi-server-rpmlintrc
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
 BuildRequires:  kf5-filesystem
@@ -75,10 +79,6 @@ Provides:       akonadi5 = %{version}
 # Needed for users of unstable repositories
 Obsoletes:      akonadi < %{version}
 Obsoletes:      akonadi-runtime < %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 This package contains the data files of Akonadi, the KDE PIM storage
@@ -195,7 +195,6 @@ service.
 %doc AUTHORS
 %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
 %config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf
-%dir %{_kf5_configkcfgdir}
 %dir %{_kf5_iconsdir}/hicolor/256x256
 %dir %{_kf5_iconsdir}/hicolor/256x256/apps
 %dir %{_kf5_sysconfdir}/xdg/akonadi
@@ -209,12 +208,12 @@ service.
 %{_kf5_bindir}/akonaditest
 %{_kf5_bindir}/asapcat
 %{_kf5_configkcfgdir}/resourcebase.kcfg
+%{_kf5_debugdir}/akonadi.*categories
 %{_kf5_iconsdir}/hicolor/*/apps/akonadi.png
 %{_kf5_iconsdir}/hicolor/scalable/apps/akonadi.svgz
 %{_kf5_plugindir}/akonadi/
 %{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_kf5_sharedir}/mime/packages/akonadi-mime.xml
-%{_kf5_debugdir}/akonadi.*categories
 
 %files -n libKF5AkonadiAgentBase5
 %license LICENSES/*
@@ -242,8 +241,8 @@ service.
 
 %files devel
 %license LICENSES/*
-%dir %{_kf5_cmakedir}
 %{_kf5_bindir}/akonadi2xml
+%{_kf5_cmakedir}/KF5Akonadi
 %{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml
 %{_kf5_includedir}/AkonadiAgentBase/
 %{_kf5_includedir}/AkonadiCore/
@@ -251,7 +250,6 @@ service.
 %{_kf5_includedir}/AkonadiXml/
 %{_kf5_includedir}/akonadi/
 %{_kf5_includedir}/akonadi_version.h
-%{_kf5_cmakedir}/KF5Akonadi
 %{_kf5_libdir}/libKF5AkonadiAgentBase.so
 %{_kf5_libdir}/libKF5AkonadiCore.so
 %{_kf5_libdir}/libKF5AkonadiPrivate.so
@@ -261,9 +259,9 @@ service.
 %{_kf5_mkspecsdir}/qt_AkonadiCore.pri
 %{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri
 %{_kf5_mkspecsdir}/qt_AkonadiXml.pri
+%{_kf5_plugindir}/designer/
 %dir %{_kf5_sharedir}/kdevappwizard/
 %{_kf5_sharedir}/kdevappwizard/templates/
-%{_kf5_plugindir}/designer/
 
 %if %{with lang}
 %files lang -f %{name}.lang