diff --git a/kimap-20.12.3.tar.xz b/kimap-20.12.3.tar.xz
deleted file mode 100644
index f3b126f..0000000
--- a/kimap-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:321dbb9881480e7fa75a9a6c8b117030f0cbc97e5e43f39dff8fe643fd271320
-size 124676
diff --git a/kimap-20.12.3.tar.xz.sig b/kimap-20.12.3.tar.xz.sig
deleted file mode 100644
index b60ed05..0000000
--- a/kimap-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEIACgkQu0YzUNbv
-Me++DhAAgT5/BtPZ/pTVqHld+mcOuYVhO+32uuO+Xdk8WjWB+0VNCNIp7l5IdGTm
-KMdEmxAUrzu56mb2DH7Q1BEAtZDmvIsfmSjXtVjYzCwHLOb9h0ONobjwwCPe4gZC
-gDcAHjlNrtRxcvVZW5d7eHgGRucMueFNXsjLwbIcjGw/9urxoxRyDqNj5QEAYzrv
-COWzS8C/9QIvJD5gNkDSAjkUOOrJOWSCCreYL9OZNPnHpquPHFyyaXOk+YMKdqM3
-yMqQaCpXgnLLw4Pjr8Ijen7Tqx8oO+pJgOhS3Ubb2p5jcM32sOU+O7RCJU/FkPyq
-FO06n2SYsk0HdxzF8w6vjvNy5XzDM4uHprTS71bIeve3l7xioy7Og7CZb130pqjd
-PjN8/DkJd20zbjorsdp1J/oXP+x1p0mhlWa+2akbsSUIHcefY4QYIRQxD2s1UGbB
-6QYPa7ClpjIT8I9U+OXU/QPy+zvRUaLf0sjB1+Obsj+MxrlFcMo63ddj88MIr0Nu
-7L92nWEswxJgp9vkc90AKv12tDsci9g7oE7jsm3WtnUq7IyGdNUxf35YlViAr1Jx
-RUy92P/6Sq2GV1SuJiNdjeUWZxn+c8Rr6NKc6AndSy+X2v4Yh8vnaibsvCcRPTOM
-rHdr5yaHycmI/d6YS0+ukk4lEhG0kn6HLMPiiRZxO1+7RDt3b0U=
-=yQ6B
------END PGP SIGNATURE-----
diff --git a/kimap-21.04.0.tar.xz b/kimap-21.04.0.tar.xz
new file mode 100644
index 0000000..b3fca61
--- /dev/null
+++ b/kimap-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd2e04c17c2fad5ec51cf1087ea59ffe1c72070afed80f4e4bbae0f0a3e66c39
+size 128292
diff --git a/kimap-21.04.0.tar.xz.sig b/kimap-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..562c846
--- /dev/null
+++ b/kimap-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvwACgkQu0YzUNbv
+Me+1dQ//dNJnONMNJddoSaZFqHqu6WMJqkiMNgeUqPf5ciBwq6vQhkBz+y766K4/
+Obt9CZUqwplO2QxctwamkqHkgRohCRkUSkFCXKD8oBxH37PCstMmUvK+EXYtYpqX
+M+U+UCiNAOvLvumLQXCQHV+X1QdChGtY7umM1l8pIBNl5u0bdNUmR6eEsQSBnY0p
+9kki6CXuYYWtBgC3tb+GZL0rj97khI5eVhjY7tkpKnFAQU0YTGauLDeYETh7kThE
+S4KmHPUB956bPcmh1zRCYthnS08jkk5QSOWe54DAhcKXEy9xzn+Ktsh1XejWmqVs
+twEnu7mwcpikGEIHbPkEZIJ5f6bqZjMwLXfjPB5+8Negl9g8PRpmy4S6EGZ6Qt3p
+934qhdHBBD3r9pu7SEA+CLTUFP5lfQhH00gBmoUbCoaHAbq78m2IwnrVO/394TMy
+lXXSwySLbI/wkUvsV8gReS08a9wJvWx6CcOVx/LcujdfBQBBtAP+IUKKogGhelBr
+oPl7yY0mJHAgItM9bvXSbsWTvAPBWHdHbNFwIxCX85gqBgeEd69n1RKbQ9ohP+Fy
+bbTqlPUDKzJ0Rxr2Xyxa6V9N5cCL74DboUtscBTGPXA6vsiHgig2m7eNeC+XsvgQ
+C82wkqEZVb/ucJk0RcpxBEziBkTZ0hoV36dpwA4Dfk/aC1mEdX8=
+=oAI7
+-----END PGP SIGNATURE-----
diff --git a/kimap.changes b/kimap.changes
index fcbd86c..452b590 100644
--- a/kimap.changes
+++ b/kimap.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:59 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:26 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:28:11 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * It compiles fine with QT_NO_KEYWORDS
+  * Use git commit hook
+  * run git clang-format
+  * Modernize code
+  * Port foreach
+  * Add missing override on destructor
+
 -------------------------------------------------------------------
 Thu Mar  4 06:10:28 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kimap.spec b/kimap.spec
index df011a1..32dc0d0 100644
--- a/kimap.spec
+++ b/kimap.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:           kimap
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        KDE PIM Libraries: IMAP library
 License:        LGPL-2.1-or-later
 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:  cyrus-sasl-devel
 BuildRequires:  extra-cmake-modules >= 5.19.0
 BuildRequires:  kf5-filesystem
@@ -36,10 +40,6 @@ BuildRequires:  cmake(KF5I18n) >= %{kf5_version}
 BuildRequires:  cmake(KF5KIO) >= %{kf5_version}
 BuildRequires:  cmake(KF5Mime)
 BuildRequires:  cmake(Qt5Test)
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 KIMAP provides libraries to interface and communicate with
@@ -70,7 +70,7 @@ applications.
 %lang_package
 
 %prep
-%setup -q -n kimap-%{version}
+%autosetup -p1 -n kimap-%{version}
 
 %build
   %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@@ -88,9 +88,9 @@ applications.
 
 %files -n libKF5IMAP5
 %license LICENSES/*
-%{_kf5_libdir}/libKF5IMAP.so.*
 %{_kf5_debugdir}/*.categories
 %{_kf5_debugdir}/*.renamecategories
+%{_kf5_libdir}/libKF5IMAP.so.*
 
 %files devel
 %license LICENSES/*