diff --git a/kdnssd.changes b/kdnssd.changes
index a26009e..af058c2 100644
--- a/kdnssd.changes
+++ b/kdnssd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:31 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:41:56 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kdnssd.spec b/kdnssd.spec
index 21e837f..3bea56a 100644
--- a/kdnssd.spec
+++ b/kdnssd.spec
@@ -22,32 +22,33 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without	lang
 Name:           kdnssd
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Zeroconf Support for KIO applications
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/System
 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
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  cmake(KF5DBusAddons)
 BuildRequires:  cmake(KF5DNSSD)
 BuildRequires:  cmake(KF5I18n)
 BuildRequires:  cmake(KF5KIO)
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 Recommends:     %{name}-lang
-%lang_package
 
 %description
 This package adds Zeroconf support to KIO, allowing the use of this protocol
 in all applications that are using KIO.
 
+%lang_package
+
 %prep
-%setup -q -n %{rname}-%{version}
+%autosetup -p1 -n %{rname}-%{version}
 
 %build
 %ifarch ppc ppc64
@@ -68,13 +69,13 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %files
 %license COPYING COPYING.DOC
 %{_kf5_appstreamdir}/org.kde.zeroconf-ioslave.metainfo.xml
-%{_kf5_plugindir}/kf5/kio/zeroconf.so
+%{_kf5_dbusinterfacesdir}/org.kde.kdnssd.xml
 %{_kf5_plugindir}/kded_dnssdwatcher.so
-%dir %{_kf5_sharedir}/remoteview/
-%{_kf5_sharedir}/remoteview/zeroconf.desktop
+%{_kf5_plugindir}/kf5/kio/zeroconf.so
 %dir %{_kf5_servicesdir}/kded/
 %{_kf5_servicesdir}/kded/dnssdwatcher.desktop
-%{_kf5_dbusinterfacesdir}/org.kde.kdnssd.xml
+%dir %{_kf5_sharedir}/remoteview/
+%{_kf5_sharedir}/remoteview/zeroconf.desktop
 
 %if %{with lang}
 %files lang -f %{name}.lang
diff --git a/zeroconf-ioslave-21.03.90.tar.xz b/zeroconf-ioslave-21.03.90.tar.xz
deleted file mode 100644
index b880e4c..0000000
--- a/zeroconf-ioslave-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1a7939259dcb77cc674f42de086a8ea12a1deb181eed5634d5df9ee8290575d
-size 43364
diff --git a/zeroconf-ioslave-21.03.90.tar.xz.sig b/zeroconf-ioslave-21.03.90.tar.xz.sig
deleted file mode 100644
index 8f099cd..0000000
--- a/zeroconf-ioslave-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsEACgkQu0YzUNbv
-Me/f5Q//efuMNwBiljjDTUdZu9wReNgPro7POPFH8IYqBRAfr5bCiaYyYv8Rb7z0
-EQVB0GR1ri8T9D4ghu+KMkze3XZ8CRBNH/+0mw3Sdcs+cc3Ts65CwKeqX8EawRHC
-CQlfOIcOaV+PQ5dVP5e4XXI4Fz3jCEb0huED1PsDpiU5InSUXXpCGk29jWUEU3iE
-1jrIt58oFIL8ZaAyF+NfZ6z4QpVv9sLcYxhJ/ebCNGsoVFapftEetoa37MU+e6OQ
-V2bCWfqrLK4OixxWJrAJAq1dN9tJnXnrLttnWVJIIb5M3JiHAaczrINS4Vu4n+1T
-ydN8mg4enGPFUiNiwfQ2RuUXdXNochUBhMHOC2FxNCX2xJpsc6eG02tiZNA/sTI+
-AZqOr6B3yB1f5Em5unLpFtErsEGhzIqw2BOi46hPX/2rj+LeND1Km0h+rmc4solv
-QIcuV04tdRheCFshPUCbgdotLbW7z9hIpX3zny0fiGo3e/0Hkgv1hOzDUxfN1hvx
-B8zbkejFsB2MhLt6sXbva4ztMMWPkhABx6fXftZZBcrxFe+4e1RFvlrNkv4mGKpw
-3MKWjywJiLjSzUeCMjGnnMA7VtVMfckPWWeLt8S2ZnGCQNaXm8RqYLxeyryUbpdh
-voFvExicN9TBd9CrD6r2BGVLa8ThSw4KS4iibVHbxM0yRbkrfNM=
-=jqFx
------END PGP SIGNATURE-----
diff --git a/zeroconf-ioslave-21.04.0.tar.xz b/zeroconf-ioslave-21.04.0.tar.xz
new file mode 100644
index 0000000..6174897
--- /dev/null
+++ b/zeroconf-ioslave-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:474263c18eb0b0bd3318b5279fc99fe0b288b5e6cffbe595111e1187fcf8950d
+size 43320
diff --git a/zeroconf-ioslave-21.04.0.tar.xz.sig b/zeroconf-ioslave-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..f6cbcf4
--- /dev/null
+++ b/zeroconf-ioslave-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwwACgkQu0YzUNbv
+Me+dUg//bRmP7u27pWg0xkoHPLIbPUJphKxEsmdlWQTiMubtE6BvoOfZGviJqxD9
+YO8PJwbA4RJ+8MKFkjfz0hkDOK4y63NG2qPws4JEQ6Aksx+ENlZxEheWbjWZUKc+
+1IWwX40QdJO6WALrNaLsnXALlqd6+n8Uu1KjfaKIAYQ7NTfP2QF5CuyVxA36b2LN
+MTvYuRD/ztYcuu0wZpiIbVcisIDyNCYey7b7aNsd2fwb5Xh+tHrqtkN6MdMYKxsM
+oeXbhxWGa9A8VCqYZAJoXT+H5aaJ3xWMToJUvM8GPFRzuzTwS9ApvPe+pfrjOueE
+E9BTsjE0UlUNts1u9YcjTJXQnn19BWY4+k4rsCWw5FsW3GOEKzck/Hgn3SbI2aHV
+Jq+fVjSvk/81RK31IN3G+f0VAciSv0p++T4n4eUNV4nbiVu3aHTBHb2m7D9X7BhI
+acwdUcr9uZOPxouBo7PYLqek2jdjUW+6kVpAKnc/FhHgWhossv/6zo40zZXIygYR
+hyW7SEI0ae23DLl5uHLM8EEY8Ys5rNV1h9gsobhynrLQDvOOz91uF76TiLE/6JO1
+xQmityNx9ZTSuvCeeMO0c8JVqYrQIfyT4RDcRoo9RetfS7FIT7sfTQWYDNMVb9XX
+SSgnypko3nmfuXWufPsc1wVNENU+paM+jpM1dv+pVyqNzITkB+c=
+=XSd3
+-----END PGP SIGNATURE-----