diff --git a/kbackup-21.03.90.tar.xz b/kbackup-21.03.90.tar.xz
deleted file mode 100644
index 33bff5e..0000000
--- a/kbackup-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1d588bfb91cce66e2de96e236510ac51a43484126bd760011b71288fa740bcb
-size 383656
diff --git a/kbackup-21.03.90.tar.xz.sig b/kbackup-21.03.90.tar.xz.sig
deleted file mode 100644
index 5d73bde..0000000
--- a/kbackup-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCroACgkQu0YzUNbv
-Me8hzQ//byYMGCzk1HDVIQf3DFGDJ3vEYl5RDrV62UR+IolG5QIFh98HB4I2WfjF
-gHdlhkj9bIoycbFPvrS28JpIETVYRnV2cSDgGNwx1FMObMd0Obmu8qHkm2myOM/A
-GtuEIawHZ52W7ym6mQD5zBowYFW/m9RTnLYB9npLg2T5Fz/rvrz4ZOHU26NVYKSM
-BLOcW8TIRE2RsloPOaqGA0RbPtMDofcxt83IiyssKmGTUzJvx5L1TDBokvotmSGo
-ZjcuDIeyXbfEpI692D2SUgM5e0Fjn3WvLnaKuSBS16h1IXeLNG77XfGeYsSYOUQ/
-Qy0rvKBgvL8AxlfwyEgpLkOsQ0LtKhSNrQ5mqAudv9kyaFNr9HdxyJ0WTZ58HMUw
-LFXoTZ+x31i6QDq6pMDbADjpPr0TvSlZhuwZMRYU/UicZg6ru0HaGX7ZBLatQNra
-cFZAJHQ88gKxcwI/0qU/8lCSP0XskqdWUIlnBIxMoFWNuk4o9/z90wTe7bm8jYQT
-bw7NOrdIwD3O1peLqE/xZXWVWeVsicSqlJqABG/Zu618DCcSH3kj7W8c2M/T8xUO
-pnQofbF8FFdUQAbXPhaWZBzF1+/joCRRH0ijvKTjcIy1KuMw0rj9LoC5TFOamQyP
-3DjO8xzwWP6QtmhEHTJDBWbQACi04cZQ5+q1g4vbRlD3xrQ7WmA=
-=Uf8x
------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 1f3a0d8..0b24d1c 100644
--- a/kbackup.changes
+++ b/kbackup.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+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/releases/21.04.0
+- No code change since 21.03.90
+
 -------------------------------------------------------------------
 Fri Apr  9 17:39:55 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kbackup.spec b/kbackup.spec
index 00e1d05..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:        21.03.90
+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
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-BuildRequires:  extra-cmake-modules >= 1.0.0
+URL:            https://apps.kde.org/kbackup
+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(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/unstable/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}