diff --git a/dolphin-plugins-21.03.90.tar.xz b/dolphin-plugins-21.03.90.tar.xz
deleted file mode 100644
index 1c51d1e..0000000
--- a/dolphin-plugins-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8f737aa0a60bfd2e1e4705bb0d4684f0d55c8521ea033be4ff20ae454aea889
-size 242696
diff --git a/dolphin-plugins-21.03.90.tar.xz.sig b/dolphin-plugins-21.03.90.tar.xz.sig
deleted file mode 100644
index 206f91e..0000000
--- a/dolphin-plugins-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrkACgkQu0YzUNbv
-Me9w3BAAghb5WP8dkxkJ+BF6saoU90O/DQh4I5sPGL2FYL5OJKzRfv1Jkgx5JLtq
-rx2LfvCWIlGjwLH6cFN5b8bp6jv7wnTcyAJJ05KFRp0WbTuN7tf+fw7csKmOrY0l
-Whul9t662NGF0iH4m91ZwPmjoRMzj46Eo+m4ODupQaoiEFhyuNreTn0DP6iQz7Cx
-n5sbADQgNbwdxJQ4Dp0ygZEa65JBPX2HrzdvVCsZp1kqPXWB05la/nmMM3GWEOuk
-uwMAUwjAzVgf9Rwr0v1QPFY0ooO/H9N/1RkgLjg/Rml6ClS+07tLnM8tPFRugtDL
-SQeLt6QFUDvXqNhZzzLE0cY9K8ObjQ5ifQI1m7m5S9xfkLe4TFYYg7bg+NvqFanp
-S0BEyZ9EgzBZNOKTrhjxpCY4Cna+Wa5/j6geTuXYo+EvDunhjA1jsZF1jW6gfzKz
-6aua92wZZLNzJVIyJQOA7AR72fyOygm0uFZJHoEEY5EtCWatx9Hw0bivjTbSqQKS
-54bhnmnSh4GKaQnXjsGqX3BEUCZLNUeafdEy9Zv1DGtbQOZtwsknx/RcvG+lf9ys
-qglMkXdZ76PbZ/So/KJ9rcMBKpNrLuLCAuGDhb0/EJX08MJNyITQP0CsTasbhwwE
-tGhr4+TqFtjdu5RvbrhEuxsAI0H9dAHEqMnyx/eTfmm1+IgsxoE=
-=buWM
------END PGP SIGNATURE-----
diff --git a/dolphin-plugins-21.04.0.tar.xz b/dolphin-plugins-21.04.0.tar.xz
new file mode 100644
index 0000000..94e12a7
--- /dev/null
+++ b/dolphin-plugins-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fb395bfc62b726a4feae87b89d97294262cdadbeadf69706d7f314b1ff488d2
+size 242608
diff --git a/dolphin-plugins-21.04.0.tar.xz.sig b/dolphin-plugins-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..b0919b8
--- /dev/null
+++ b/dolphin-plugins-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvMACgkQu0YzUNbv
+Me92hA/+ORVRYAjYgpWntlUtM2XRiAxxGKyd7Gr8+F3DcXHjz+DdTK4BxsPESTM3
+EIJnhI6UTwSYq9qb0FFO9GZUceoWVuVeLT2sPPbxs4KqUYCejSEUAlleVf7PRgN9
+gRc4wcDW/vZh9fUACjakCKRTRPjqwN6SedrxJleyUy6q7yNMVW39QxtDcGnzESvo
+PmT+3ONxFacxwP8yPnmwHpCIRJpKIjLqAgLCYbhf4Cq+tFfTBqnYtBjQwTOiIiHm
+XjI+/b6hP29mVWLtB22FLfMO07nWaIu8I9TrvJtYx81f04q2CcnWiVLvjXL0cWei
+VN4mTYv+yS0YIKdxxaXlUXw8zNwbwD0y2fbUgWJzFScCgfYqB2M9WaEyhY2AAJ19
+kXuKfGCJQlmke19SU6p1a0WqoWkoW6uhGTWTMZwBYJYB7zmYXMAO5novfIumACVu
+AKaWkbOxiWobWuC2cgNGSA0kLlF6lB6LlnGYtq2XF9ra3cWP2dzQai/yDp8m94X1
+5+3GQK/Mt3sAMirBkVSyhNk6ckkfCRVnk9Mbx1MHd2Qi8qL0dgZXJuRSSFtyQW+0
+sL/PmH3c7rpEtb351vKm4jp3a3UIONeHp60FcgoEQvVZmIGIWpPPo5j/4uj3HCv7
+edWYSju3PDWcYyQtvvLXgO8vUBIo1H6BJNlzz9RDWOSoiyr6jB0=
+=/zyW
+-----END PGP SIGNATURE-----
diff --git a/dolphin-plugins.changes b/dolphin-plugins.changes
index 5306690..a6041b0 100644
--- a/dolphin-plugins.changes
+++ b/dolphin-plugins.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:08 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:35 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/dolphin-plugins.spec b/dolphin-plugins.spec
index 9faa2c2..62b043d 100644
--- a/dolphin-plugins.spec
+++ b/dolphin-plugins.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           dolphin-plugins
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Version control plugins for Dolphin
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            https://www.kde.org/
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+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:  pkgconfig
@@ -44,10 +48,6 @@ BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5Network)
 BuildRequires:  cmake(Qt5Widgets)
 Recommends:     dolphin >= %{_kapp_version}
-%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
@@ -58,7 +58,7 @@ Dolphin file manager specific version control plugins that:
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %ifarch ppc64
@@ -78,7 +78,6 @@ RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 
 %files
 %license COPYING*
-%dir %{_kf5_configkcfgdir}
 %dir %{_kf5_plugindir}/kf5/kfileitemaction
 %{_kf5_appstreamdir}/org.kde.dolphin-plugins.metainfo.xml
 %{_kf5_configkcfgdir}/fileviewgitpluginsettings.kcfg