diff --git a/kio-extras-21.03.90.tar.xz b/kio-extras-21.03.90.tar.xz
deleted file mode 100644
index d8290d5..0000000
--- a/kio-extras-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30b98e4741ed9b08ce84e9d331260c1a378893705cd6f0f0d654864895e7c761
-size 646064
diff --git a/kio-extras-21.03.90.tar.xz.sig b/kio-extras-21.03.90.tar.xz.sig
deleted file mode 100644
index 9eec11f..0000000
--- a/kio-extras-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrwACgkQu0YzUNbv
-Me/Wcw/9ExIqs8J0pI/R9qfuMU4H2Cp4NXRy3y9OJPGMIakL4WsbAB4ctKj2LRoy
-tqep6qzA+xWyrx/9fQb8PjQJAJpyLNaXV1rluZi0oSyhEdCwLPSEkzOTwBcipZ6v
-Ij3lnjkAGanGFjV53BNk4ssv779CxFoAOh1/TTLEY01l++/KxPdwn7u8UQq9wjU7
-8niNEMEw7qsV9BeL+0W8pEma54x6vIzssFVO7gUqTAjko4PSzkALc5ZAf5a/V3BA
-hjrVGeSW+SrhgFmlStrf2dhf2cdDOhN27mTAM9K2kNyhiVglfPL15wpz5drVJKP9
-slQe6vkPH3NStXF0w+LqU5jeWMZOfFhGYXPJ49+OgF2PCrfzud+MUO6rRSUjfPjT
-+DxmJvqm1HUmQqL8T4u3Vrqt5tsjw+TUo66Js15NoIzQ6SaJWPkfglp2lPXQ2iHh
-97hRU+kdRsusx2HTFwoz1Kxj6J0zaa8AUwHwpAb7wd+zW1GRuR7v9i4LcdUo9N+1
-aNvlr5u+PfJ5fiuS9KjpXtx6RNW2TAi3E0auulE1cpMs/yOPWKDIiNTlala4sCYh
-6nB/1Yq0VEMLBeP3h61t7IvqgTrfwwFWVmsks5nGPM75IpAc4s7ohAfNtn0StOS8
-r+tk9LkOrxZb6rp0jOw2QDwwtcIB2hHd3Jhr/2wtTX9FKSMZLTo=
-=YHFF
------END PGP SIGNATURE-----
diff --git a/kio-extras-21.04.0.tar.xz b/kio-extras-21.04.0.tar.xz
new file mode 100644
index 0000000..39959e2
--- /dev/null
+++ b/kio-extras-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f4a6f127a29d68e7c8185ff9f67a2c1ceb2df8edaa87bab4bcc974b5869b3dc
+size 646088
diff --git a/kio-extras-21.04.0.tar.xz.sig b/kio-extras-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..880db92
--- /dev/null
+++ b/kio-extras-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvwACgkQu0YzUNbv
+Me80FA/+L9EnNxfWEI5BCCrvr5z8zMgA8KztIdmZQ1gieNFALqmYCtAfbij4K2iG
+nkeQeGCAvoIE7OqNkjRbvq3JUzTrvNYdeJ1SxkOk0y+EvH5MSIEUCxT3zn6BeUDp
+WymQLXedAyQAKstLL687q3S0IRiaiFZpf9TNg47VII/eQVxx6tZQ0ki8ORwP8HB8
+poBupyjVe9chS4HHr2j+gQJqftI+SnamxX7N/W5lwRSYcpMSc0QZMgw/JRE5SNug
+DCUDbQtDYjlEUXwBVnulGgvQnUECMRa/mD6+a6yrABM1rfcMSq7Qe34sOwTrwgk1
+4QOY/WZgQN/cEf1Ap0qhXdangb/2JwY/ogrM0IH1fFyqaYzMvFqwNxhcMOwTBaGg
+UbAQ5mRzGq8jIZ0pe8dgC1+Kg4HnK/v1W8jCsPR1XHBh7VviKOoiMNWLE6oRie5W
+LDQlXgDgAV91AQOYB6lOdlhMEfZZqn4Ejca3QjeRvRT6fqE8aY1L/Dg6hOxf4TKe
+62D6eJuW+96XS/OzUDfWQbA1srY8UobFa42UsdCFwU1GJvcG+wzb75Xzs+VtfuZW
+7woMKBJIoU7+xgTTW10OyK0Z0+1jSOSL6KzLtZvcNzB5jRp2mGkANwbi+qE50Stv
+mtnUs3qf/ul0Yh6xsSnD6z76FA+I71LhlBlep/xwIEr+H/JK/dI=
+=itBv
+-----END PGP SIGNATURE-----
diff --git a/kio-extras5.changes b/kio-extras5.changes
index 57ca80a..f115706 100644
--- a/kio-extras5.changes
+++ b/kio-extras5.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:00 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
+- Skip the openEXR optional dependency for Leap builds
+
 -------------------------------------------------------------------
 Fri Apr  9 17:40:26 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kio-extras5.spec b/kio-extras5.spec
index 93aed4e..0fd9c89 100644
--- a/kio-extras5.spec
+++ b/kio-extras5.spec
@@ -22,15 +22,22 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kio-extras5
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Additional KIO slaves for KDE applications
 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/%{rname}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
 Source99:       %{name}-rpmlintrc
+# openEXR causes build issues for Leap 15.2 & 15.3
+%if 0%{?suse_version} > 1500
 BuildRequires:  OpenEXR-devel
+%endif
 BuildRequires:  flac-devel
 BuildRequires:  gperf
 BuildRequires:  kf5-filesystem
@@ -74,10 +81,6 @@ Provides:       kfileaudiopreview = 4.100.0
 Obsoletes:      kfileaudiopreview < 4.100.0
 Provides:       kde-odf-thumbnail = %{version}
 Obsoletes:      kde-odf-thumbnail < %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 Additional KIO-slaves for KDE applications.
@@ -99,12 +102,10 @@ Requires:       libkioarchive5 = %{version}
 %description -n libkioarchive-devel
 This is the development package for libkioarchive
 
-%if %{with lang}
 %lang_package
-%endif
 
 %prep
-%setup -q -n %{rname}-%{version}
+%autosetup -p1 -n %{rname}-%{version}
 sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
 
 %build
@@ -119,7 +120,7 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
   %endif
   # we don't need nor want devel symlink, and dbus interface -- kio-extras don't install any headers,
   # nor are meant for development
-  rm -rf %{buildroot}%{_kf5_sharedir}/dbus-1/
+  rm -r %{buildroot}%{_kf5_sharedir}/dbus-1
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -129,7 +130,9 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
 %files
 %license COPYING.*
 %{_kf5_configkcfgdir}/
+%{_kf5_debugdir}/kio-extras.categories
 %{_kf5_libdir}/libmolletnetwork5.so.*
+%{_kf5_libexecdir}/smbnotifier
 %{_kf5_plugindir}/
 %{_kf5_servicesdir}/
 %{_kf5_servicetypesdir}/
@@ -141,8 +144,6 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
 %{_kf5_sharedir}/mime/packages/kf5_network.xml
 %{_kf5_sharedir}/remoteview/
 %{_kf5_sharedir}/solid/
-%{_kf5_debugdir}/kio-extras.categories
-%{_kf5_libexecdir}/smbnotifier
 
 %files -n libkioarchive-devel
 %{_kf5_includedir}/kio_archivebase.h