diff --git a/mailimporter-20.12.3.tar.xz b/mailimporter-20.12.3.tar.xz
deleted file mode 100644
index 8cca7c2..0000000
--- a/mailimporter-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d67af2f3f62ccf934b4c23982750c05e70bbc144bea231eba560278363de73d2
-size 548588
diff --git a/mailimporter-20.12.3.tar.xz.sig b/mailimporter-20.12.3.tar.xz.sig
deleted file mode 100644
index 166abd2..0000000
--- a/mailimporter-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEcACgkQu0YzUNbv
-Me9paw/9EI6XKf0e/Ua8qRfJz9mUHsxouuLGgvKUVNz5mG8H4nqc1rRVN6YfW/dd
-rJYa8ba2BDcmzRbNGHb5+qXrsXM8zM1GtF1Y5ayHlu3jWkMlUu85FWH68x3cVsXJ
-o4l72oeQNQe35sBSGb5bFMvrm8veb2JoV2qanH1VAO0L3PqCIFiC7Y79rlxUzkLj
-IhB0ZcDKBh9Z6cA9iTKSRO02K8GbUFo6YWjgp6Ehnv3GYEtxFVTcpkRIn89rfML1
-9a60ErI36JD47YVmkMAt2K1ovGIXAjWFUFsi5EyCnaK5F8fgwp4FYophckTc+PWh
-DjPsYAOd8wDkPKz7VTwKj/Qn654YTL6/NyJSeRAlg/AOcuMIaFUA7NypK6T51tM5
-QDbA9OtDZNYEcMBKE7kmI4tCDzgSau8C0j2loldELb7aoRQz8f2kWNytb/qbEr04
-9+ogccHibl+fseU87HEjXnPNQ2hWfMm0QjrTCMHDgaMhDgIRA1F94pdZ/3FCr9Tw
-ry5/I2jI4RV3tYgqIuKIcmZmIvIycen7q+ln4+X9I4xEjja5Qd9mqSRfU02tzE7K
-7EuQrGckjI+bgLMMnvW2jo8tfeUDRQGhxnmOBi8r4F5eZJLXE1jGsdEpgAJhIbLo
-cWGHoCgH1bXrGAIcnXdJOOLzLz+Vyu4qWPxjYYtxpZWTHAENZuQ=
-=6DMT
------END PGP SIGNATURE-----
diff --git a/mailimporter-21.04.0.tar.xz b/mailimporter-21.04.0.tar.xz
new file mode 100644
index 0000000..6513a71
--- /dev/null
+++ b/mailimporter-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:656ba4469a8d51a5c336e6b16dc5a976119102103535dba269fa65c60656fb1b
+size 552884
diff --git a/mailimporter-21.04.0.tar.xz.sig b/mailimporter-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..4fefa50
--- /dev/null
+++ b/mailimporter-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwkACgkQu0YzUNbv
+Me/UmhAAkRYzSl5YK+403JSVafAeXlMTgnLgW6rav2VBSOPPxzmVKd6CSigJGdU6
+sXIJiyFjUJo8buQ9fFJejBHfJQR+grF1pmDIFx+K6dxLaP4vGEEz3h4tCPPklBp2
+8T6tiLbO3g7SZxmdbd5cDdTvM7Ts2PJQeTN2FXKCdkb4ckm6uXCJ+EIB4PR0oPTb
+24/Ced391JoRR+2KWHLjH2kcuAcoVItT7KWPI50mp1R47WBDhwVNsPw4lRkttedy
+7KOImZh7lD1JNVcyo0X8/2enaN4jL8xUg7guyyCDTpm+sq+87iyFA5Y2idB8raOq
+IZxmQZeFx1/LHo/cesWQuWwx+hiUS6m9aEWAAxeqmfqnl5gnAdBOKbT8nap7M4QE
+hfvTJM0tS+UnnQQe6MEw/b3MdRI6of9o6Fj3J8BpDmurrwObayPwjx0MaDEUmnBK
+qxyvoqGc30FL23IdVlKa6qb2mh1Fnk7+u0GyLHusdxpl891pkWl6Z4qtmw6MEyJ3
+L4lf4W6PjS1R10OWarVdOmAtUHUM5Shu/2uOl0pITTrba7BbisshOI3dDQWm5Ujs
+1RKRVv8hzaI0iUGfp/7tvLNfjLPrgmqeyzX6fUQQwf2BMy9PvkRFcAMaZUtz+aZN
+aHQKbT9TjGePLjsUe9k8+i/uF4eTAJAR0Nuw2Ya2IZoLfqIt5WQ=
+=sWg/
+-----END PGP SIGNATURE-----
diff --git a/mailimporter.changes b/mailimporter.changes
index 0bc7fb1..2f21b3c 100644
--- a/mailimporter.changes
+++ b/mailimporter.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:14 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:41:40 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:29:42 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Remove not implemented method
+  * Use auto vs auto * where it's possible
+  * Use git commit hook
+  * run git clang-format
+  * QString::split(..., Qt::SplitBehavior, ...) is already in Qt 5.14
+
 -------------------------------------------------------------------
 Thu Mar  4 06:11:50 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/mailimporter.spec b/mailimporter.spec
index 2d4c565..6cb9796 100644
--- a/mailimporter.spec
+++ b/mailimporter.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:           mailimporter
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
-Summary:        Mail import functionality for KDE PIM
+Summary:        Mail import functionality for KDE PIM applications
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 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:  cmake(KF5Akonadi)
@@ -45,10 +49,6 @@ BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
 # 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/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 Recommends:     %{name}-lang
 
 %description
@@ -91,7 +91,7 @@ used by KDE PIM applications to import data from other mail formats
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build