diff --git a/kipi-plugins-21.03.90.tar.xz b/kipi-plugins-21.03.90.tar.xz
deleted file mode 100644
index 906d0a1..0000000
--- a/kipi-plugins-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46b7bd4cfad7a468d4a83fbdba6ef76750818d7e1304ed50fde91c81bce237aa
-size 1650968
diff --git a/kipi-plugins-21.03.90.tar.xz.sig b/kipi-plugins-21.03.90.tar.xz.sig
deleted file mode 100644
index 7859bbe..0000000
--- a/kipi-plugins-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrwACgkQu0YzUNbv
-Me/6bRAAl9KxogeToqx1eEV0PjTPXbunWmSGNXrMvQeZrWuCmC1FBtsjw8yV11Ju
-8wDy+bBzVYNZSPpliNXr7qgnDJJhkJ/GC44IPOLK0MChfvUoySmhv6ACa7oUkZEF
-9/qlyC5hzBZRd3VpCvRi3P43PR+LAMoZMy9PLRCDa5WiM5ylbj98zLoB8AUIAqPm
-rOt7t7+tBQwjShrilaN4ec1Xm858FSUy4dMN0bcM7atcHVnsX6dMb/Qjrc8afbkh
-P+lfB7iB+Aco2S/HEOxqnMKOJwYVrGfZ2c0OqMcA6ctVT5p9oZ3xO0nVXomkqVyT
-6APUc6J5hXi1IiB6rkkTcBJCi3r0CeBtdupA5Vw4nZS7wEvhMUIK92qbHiTmn8Bx
-1t2toNUIJwwK8R5a2xlgm9HbB6TMnBvBxv90vRLABv/S8hpRXm5g1Ff23CDMGH8N
-aR587aFO4fLbc+FpGObtYydZROHqEE1BNtVRaPbkyoVxvnufU+RTGCDFp1IOL9KC
-5vaYXRbJ390Ax9yFrqr8n/UVrohx50pbfg9kwzf0UpUtM29Kl/0in4xRqCr4QoKT
-eYrydp2acLarLzxYbJS9+zgNZuuLTAn64fK4tpwBa7LIf3KSTiyyQwWQ9i5gCa1J
-72BrYKbZ2UYd9UKye3oDb8OzY15B2SEIOo35oO/MiEOGbfN2kCg=
-=4bCa
------END PGP SIGNATURE-----
diff --git a/kipi-plugins-21.04.0.tar.xz b/kipi-plugins-21.04.0.tar.xz
new file mode 100644
index 0000000..e99127b
--- /dev/null
+++ b/kipi-plugins-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e3fdb00dc5a6d9b0fe3cfc75a942017d4131a6d3304213ca5fe1ee202f746f4
+size 1650804
diff --git a/kipi-plugins-21.04.0.tar.xz.sig b/kipi-plugins-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..e902897
--- /dev/null
+++ b/kipi-plugins-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvwACgkQu0YzUNbv
+Me9tVw/9GJU4Rg4xAyUKvvEhJ58hjQo8hrE+MqTc7LSIkB3C9uyac8kRQIfVDyYY
+pTbIQdvrwxPtSGMKxt+tSa1qiw1gBI0PqwJ9Zc5snfyfBmmW3HxfF9QJjYwhJlBj
+ubrlaULeoFb4tNkZT/SRnR54CdjUel61gAPSDxF7MAlJ/8ZYhIkO5JPyTZo7X50J
+SP1JvBIb6af2/8vX1F5+guLzthIZfMROHVYW1SvWLIuyMH0ldxZE6XIYgQF/7pkg
+vfbjoHMEM+fOF/GVYDNk+Qi7iHbaS/2sm2RQr+/LvDnnRUyCrYMF+9Xabrc9b+E7
+CB0tu5lVO3UfLcpHNJbXN5xtlFfmDsjzEiHNUaPLvqWmRJNtznO7qMvkF090LTp+
+VClRvlzNL97opyV+FZxfZ1Q6u5qkvyLRmVUO2hTMha5LDcpc8pTmzd2VgyXGQzeY
+axXiirS3xsiZHSodhwPyJYojvNAYZq2o5CGKf8yCWeqAhTKJ60wPsU1Wt0Pfs8zk
+ugpak31EcFltu8RL//YPu0XomnAwRQVGPPN8JjBCHq6UMAnkrA/YbzfsmqOjv/0o
+zYVF8M7JREf6KpzQOaQ/UWTwgzDTyEEPC/0FX7mCFxjiRZeBRaeAcErSH6JsAKV/
+HIMn1U+bTIHPThZ40nOC1l22fxACH+2WTgsdWQMBMWOb2p+Mobw=
+=D05N
+-----END PGP SIGNATURE-----
diff --git a/kipi-plugins.changes b/kipi-plugins.changes
index 4d05637..5e9a953 100644
--- a/kipi-plugins.changes
+++ b/kipi-plugins.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:01 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:40:28 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kipi-plugins.spec b/kipi-plugins.spec
index 7b6ed1b..ccadab5 100644
--- a/kipi-plugins.spec
+++ b/kipi-plugins.spec
@@ -18,13 +18,17 @@
 
 %bcond_without lang
 Name:           kipi-plugins
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        KDE Plug-Ins for Image Manipulation
 License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Other
 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:  libmediawiki-devel
@@ -51,10 +55,6 @@ Obsoletes:      kipi-plugins5 < %{version}
 Provides:       kipi-plugins5 = %{version}
 Obsoletes:      kipi-plugin-icons < %{version}
 Provides:       kipi-plugin-icons = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 A set of plug-ins for the KDE KIPI interface, used by some KDE imaging
@@ -63,7 +63,7 @@ applications.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
@@ -105,8 +105,8 @@ done
 %{_kf5_kxmlguidir}/kipi/
 %{_kf5_libdir}/libKF5kipiplugins.so*
 %{_kf5_plugindir}/kipiplugin_*.so
-%{_kf5_sharedir}/kipiplugin_*/
 %{_kf5_servicesdir}/kipiplugin_*.desktop
+%{_kf5_sharedir}/kipiplugin_*/
 
 %if %{with lang}
 %files lang -f %{name}.lang