diff --git a/kbackup-20.12.3.tar.xz b/kbackup-20.12.3.tar.xz
deleted file mode 100644
index 01320ab..0000000
--- a/kbackup-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14bb667949b7818bc5bfe5731a89e05b1b3f8890b1c825459c47905c88491213
-size 380824
diff --git a/kbackup-20.12.3.tar.xz.sig b/kbackup-20.12.3.tar.xz.sig
deleted file mode 100644
index 9413ffe..0000000
--- a/kbackup-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEAACgkQu0YzUNbv
-Me/60g/9GCq+mgADsuApJa9cG68S8hq+1BSITWWdKR7/pdmCrNUiViJngmG2YAma
-/29sksdJJ/iPxS+l+KIOm0FoAfjmusU6SO8DLakDQ2oeCKXe6xc2Nuv7We4PbUuO
-OImHXrp62nJCpoqd1X1Agd55mDa90auh9NVSrBFIK6NEtHBx1/7axG/cFei7yNDL
-pgUTX2rgbWfPtn+DWlW/o2FHLSzv4f7MLMOxVsnUc0BIbKSSUHIDv+Ya6ai92KQ4
-9dpYGoO/+9ytAiiqHWvGu3o/722nhs+jN72CnP7hoEu3+/LmM3mIkGBe37yyZ/X7
-00selJcmF+KQqCs6F7VBSUt2LWBfOU4VSlZp2AbrtMoMK6eJ79jMHeYDuY0R4Xum
-bA3BW5QJOGHnIKwoJ2FfdQV/uwrOBTaqorw8jz/lbtoHB5Ygh/x3GXoXlVFD9Fje
-OAhZX4G0FmoQIDGNhtuzpKSl97tIk84S50nIgyo2Jeog1bdfMhpVVaEIQGACcF0O
-apFnxGfBrSOrYy+i2Uag9GcPVqQkeExwWYWBg8bxPG267p5B6Udwi6PvBSTN3W8b
-8lp9scoIbfsRilDRedldP1Wy1VnyuPO1nRhAtq0LCTI5koBtRkBG+iobc5XqHLSn
-YtMwjiJKRzY8cBRlZ5C+RLqXXOqIXKc/3NmmnzCNVAFLWWxeTgY=
-=DqBs
------END PGP SIGNATURE-----
diff --git a/kbackup-21.04.0.tar.xz b/kbackup-21.04.0.tar.xz
new file mode 100644
index 0000000..79bfb9e
--- /dev/null
+++ b/kbackup-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfd36d98247213b963c1ab2c518763f66e6279e6aa4317489c2b3f21db996bd0
+size 383604
diff --git a/kbackup-21.04.0.tar.xz.sig b/kbackup-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..0bd9b97
--- /dev/null
+++ b/kbackup-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvYACgkQu0YzUNbv
+Me9HUw//ZMxJOGtbnC2UnvttaObRMNGzCMXC8vqqTYlKGhQGirXFO0N2vsrNSa8u
+hKwoYN72/OLxJ8+3N2OOTUmjkUAuqB9neA69EJIXmo+awEpwLoj0aUXRRYP466//
+bCl4E9tE09k+xQiDLYXYsrzsDF1m3g4obsaky1TnPT+cMaDh3ZAkpNVkxUXHTSXt
+FnYgdxIaBxBHlXgnxjcuvYfRPpwD7ThB/RRODghvdz+dScQPOVIl0LTmNOuBhrwy
+1WjQZAh2LSB7gVbs02Sq5/F1C4Mb5ELh+jNjBPMAIDiRONy4wEDTgbWdBXH5h9iZ
+WXQ4J6wMUrnAWC65DcPv7b5koPjBqubOyOnd4f8hPyjSdhSB9OYjar3RmSjiB9rK
+r/cPnbPQuLtJ01a4MzzdOPXtGR58HzQgm6htUZ6qttkQRjkOCORXVhP5hTTOCOCM
+OPy3Yq8CaJ+n0QlAb1wXMVlDh4sWb7icL7dazrPaMMkLVFAZvB8rK4Ua9JsWnAmu
+X4+e5agQAeE1kzE8zStVRFa3LgOjVA+vf+wtNmdevT6dVQNAPQge7qATovoVWBt+
+4esEn42C2BIwFjQVCqY38KxtanYO2x7y3zdTp8DAyMiJwa7hUaAXj3NpNelt+qjY
+FgUuUdOcfzDJhr8KqXKQTufrvQzUdyG0f8Vx0TZOstjLdk85kiw=
+=zQMB
+-----END PGP SIGNATURE-----
diff --git a/kbackup.changes b/kbackup.changes
index 0034706..9733bbe 100644
--- a/kbackup.changes
+++ b/kbackup.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:28 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:39:55 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:27:36 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Use KDE_INSTALL_MIMEDIR instead of custom XDG_MIME_INSTALL_DIR
+  * operator+/- is disabled for QFlags in qt6
+  * Port from KMimeTypeTrader to KApplicationTrader
+
 -------------------------------------------------------------------
 Thu Mar  4 06:09:54 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kbackup.spec b/kbackup.spec
index b7bedb9..95b1726 100644
--- a/kbackup.spec
+++ b/kbackup.spec
@@ -20,14 +20,18 @@
 # 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}')}
 Name:           kbackup
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Backup program based on KDE Frameworks 5
 License:        GPL-2.0-only
 Group:          System/GUI/KDE
-URL:            https://www.kde.org
+URL:            https://apps.kde.org/kbackup
 Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-BuildRequires:  extra-cmake-modules >= 1.0.0
+%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(KF5Archive)
 BuildRequires:  cmake(KF5DocTools)
@@ -39,10 +43,6 @@ BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(KF5XmlGui)
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5Widgets)
-%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
@@ -54,7 +54,7 @@ Although GUI based, it also offers an automated, GUI-less mode.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build
@@ -72,13 +72,12 @@ Although GUI based, it also offers an automated, GUI-less mode.
 %license COPYING
 %doc README
 %doc %lang(en) %{_kf5_htmldir}/en/kbackup
-%dir %{_kf5_kxmlguidir}/kbackup
 %{_datadir}/mime/packages/kbackup.xml
 %{_kf5_applicationsdir}/org.kde.kbackup.desktop
 %{_kf5_appstreamdir}/org.kde.kbackup.appdata.xml
 %{_kf5_bindir}/kbackup
 %{_kf5_iconsdir}/hicolor/*/*/
-%{_kf5_kxmlguidir}/kbackup/kbackupui.rc
+%{_kf5_kxmlguidir}/kbackup/
 %{_mandir}/man1/kbackup.1.gz
 
 %if %{with lang}