diff --git a/akonadi-20.03.90.tar.xz b/akonadi-20.03.90.tar.xz
deleted file mode 100644
index d82b8ce..0000000
--- a/akonadi-20.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9830aea09d81f15fb185a8ba9b70011162f49c4d07f32642e4293d977613d07c
-size 1580612
diff --git a/akonadi-20.03.90.tar.xz.sig b/akonadi-20.03.90.tar.xz.sig
deleted file mode 100644
index ee1410b..0000000
--- a/akonadi-20.03.90.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6G3sgACgkQ29LOiT4t
-HIerowf+IJs9Cd1oEQOjbk7oLtllpGznH4fQXk/oGNXuR1PMWPDoQC5hgqCwwhN9
-sjs3PWhEPpHiyo/77WvNOwmkM4Q+qvrQFPh6uP/AV6ltkHRU1mMf/YKT0J4R4SRC
-hWlxwk5RnUmXNIoww80HkbQjkXNASwXr/4f4ZQd/txikA/FA1M2LeJ2Gd9VSga/0
-aYoj/u0E5hOtBnIwgB/r4vkwnjPl5unE39FAfxtBSPJBJwq0UlHHDcwhf+G9tnUt
-uR+USYkc+vWY6KEVFg9xC5YjGnXlu0vyK5un33WNyFq2fYYwWOqZ3EbPt7SKijKH
-vRFTMHJ1YGpI/E1a+fHMFz+XZAcLRw==
-=9iF2
------END PGP SIGNATURE-----
diff --git a/akonadi-20.04.0.tar.xz b/akonadi-20.04.0.tar.xz
new file mode 100644
index 0000000..7d030e8
--- /dev/null
+++ b/akonadi-20.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e78ed3daee90613c2f58f5b33b5acbce6e78b2790f746b4ad02b5d4eace0eff8
+size 1584268
diff --git a/akonadi-20.04.0.tar.xz.sig b/akonadi-20.04.0.tar.xz.sig
new file mode 100644
index 0000000..5f114ce
--- /dev/null
+++ b/akonadi-20.04.0.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6gJ+kACgkQ29LOiT4t
+HIfpXwf/QvsyHEUidxOdxSl6xM7CL8QYOvDmRprFyf32AB9lNhHts14vpRu7CCOT
+cvrIHZRzVZEPW84tsS1l4e8DGQ9omQixV0dvTK7hvT1R/5tubbbXaNxcY3S9nrcx
+YR2N99zf+/ZJN6CjtqiNDRpmDWorCMMaht3qXABvdR00E9dANpfNcukxMhAtnxO/
+p/NjJUyTXLVFm+2n8lghWMLachqECD+aLpWA1RtNcGRw9kOTff9xp3JjHnS+7sKy
+ZzmGsWfnwts5FAyuNX1WWYCYExp36g/SgI4IQwkUvJ1AVGdbOKwKuddvw59IMm75
+uqX34l6iFoWI/vrTr3lCJWPoh5Sffg==
+=9T3H
+-----END PGP SIGNATURE-----
diff --git a/akonadi-server.changes b/akonadi-server.changes
index ce0e3a4..fa6ec6e 100644
--- a/akonadi-server.changes
+++ b/akonadi-server.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Apr 23 12:21:43 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
+
+- Update to 20.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/releases/2020-04-apps-update
+- Changes since 20.03.90:
+  * Try to fix compile against qt5.15
+  * Akonadi server should not expect specific mysql server process name
+  * Fix emit signal before class will be deleted
+  * Add signal when all settings was saved
+
 -------------------------------------------------------------------
 Sun Apr  5 20:29:31 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/akonadi-server.spec b/akonadi-server.spec
index d21d0bd..556e204 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -22,13 +22,13 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-server
-Version:        20.03.90
+Version:        20.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
 Source99:       akonadi-server-rpmlintrc
 BuildRequires:  cmake >= 3.5.0
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
@@ -79,7 +79,7 @@ Provides:       akonadi5 = %{version}
 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
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
 Source2:        applications.keyring
 %endif