diff --git a/kfind-21.03.90.tar.xz b/kfind-21.03.90.tar.xz
deleted file mode 100644
index d23181a..0000000
--- a/kfind-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4869b7cbcf082b95ec20670d75d15a30b22decc24f40cb6c3ba67053c1aac34c
-size 271628
diff --git a/kfind-21.03.90.tar.xz.sig b/kfind-21.03.90.tar.xz.sig
deleted file mode 100644
index 2e5d69f..0000000
--- a/kfind-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrsACgkQu0YzUNbv
-Me/dAw/+Pfk9JaaDckXQjpFy07qGTCCtSu1vo92qXDPz/MDilymSeGg/yJS4Ics9
-CbGLZHzko6wN0cgKWUaaqmAasoPPN1toThN1PjV9GIpC6C2H6lOgWIeRG6ZQP1L8
-VMfrI+vv1MX7pPBoKV5I1UfwGb+GSnuA9mXWBr6KfWZIrIYstoTqR7USdXGObo7x
-hRSorPiPnFhhMSb9Ce5YzhnoJPToWKa4BSU+c7V4eHKmEJ788UMp1leAnN6DIMqw
-K9ZwSf7GawqYIeEzkj8FPSy7uy1lQSOlZTnDFY0VCBGw0bp6rlcbjgoMKv8wZbXW
-QUs3xbvQY0UEaXk16/lt7IxpDLYbodKCbNPF6QtuKETBN+gAGiPgzX6uR67/Bsj9
-a1igENCHMvejdLMegW3f2IxeLQ7QAgfdGYgau9kjJlIAd7BL64Pn8Vkh7ctmturN
-FGZ5y/iHFk4axmruRCvUb422m2BZT3eKDPMYMn13+c9tlWQiKXCl3hLpTv63YzA5
-lDAEKex03uPBWh2mqAtIypTUgLxW2hJvCTMYv+ZduLyvcT+c5HtBye7kpUmeAKqc
-cibAvzhoDLMK3zHjv2okpRLTtMZik9o8/ai4SJokvYYaJJ3i3AI+4HXLX38GpMF7
-pE10dHSXLXHzHllEmVH5ktLgMRVhPrk4UIRA0ca5vdvUy/mwzWA=
-=cJNW
------END PGP SIGNATURE-----
diff --git a/kfind-21.04.0.tar.xz b/kfind-21.04.0.tar.xz
new file mode 100644
index 0000000..222c2fd
--- /dev/null
+++ b/kfind-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72bfa8708e0e627fff6cc78693f6c778ba27cebdc65f84c69189385de5814284
+size 271640
diff --git a/kfind-21.04.0.tar.xz.sig b/kfind-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..765acc2
--- /dev/null
+++ b/kfind-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvoACgkQu0YzUNbv
+Me+sCA//WvJo7xtYysIHI4hNDS0br+fIzax1tW81IldnXhRrtodzFb3e1XIQC9bX
+3wrdgsNsOMYRp1nsfdnE4AntTgD4KY6izDNVl/V7A94Ax8ZmwvK7F7h2qinHjT5I
+KASATQDEWkNqBxC+trKt4ANlhYBeDNtj0nuL/fOsciL6mRDxlknoReCSjIoWYMTE
+f7IA67SuJ+KKZHPWff2PoXvy33Vu4odauELgyzjVrkMWfAxT+jaWK0YfO/vbiMhp
+Cp2ciiIDearQ7BTgLk5VnFcSPmY1toGUA5OsYJS6OxVbkggeFb1F1rrpcAfeJ1e6
+DE90hULxpxoZCwZi8E3EudSNMzKt3zzEi21uY2d44XZ0fzYNgHlSMVmjBGEZo3QD
+QtTmGSIcvSB46yhMbbZS4IUg32sl5Pivp9ZkynNfpZirdoJg1g7IoRO4vTshdVTD
+aMRwKtMXywXCC5X3y/aqZprkfAEeh1OOwSIxclgjPBrq1lBHYLmlqZDop+fmm+dj
+ylsQff+LoeR/RTeVBu0v1VMUd4E8O+q3bCeQDPj6hpBc2hARhE0azvH/FdhL5Q5a
+xKlpVb6tfsCTF2SJUzwyyEMV+8FHXFkfMSRCkEOV/6N9sGW4WGAIlPm0tZ03XvKP
+RdofAx/ge4mQ8Fm3swWUJpKdXyWylPOi5/Ja076K9kyJzJwxLnM=
+=/gGt
+-----END PGP SIGNATURE-----
diff --git a/kfind.changes b/kfind.changes
index ac583dd..105d5f8 100644
--- a/kfind.changes
+++ b/kfind.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:49 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
+- Changes since 21.03.90:
+  * Fix assert from QAbstractItemModel when clearing an empty view
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
 -------------------------------------------------------------------
 Fri Apr  9 17:40:16 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kfind.spec b/kfind.spec
index d6fb0d7..0cd4b44 100644
--- a/kfind.spec
+++ b/kfind.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kfind
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        KDE Find File Utility
 License:        GPL-2.0-or-later
 Group:          Productivity/File utilities
-URL:            https://www.kde.org/
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/kfind
+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:  hicolor-icon-theme
 BuildRequires:  kf5-filesystem
@@ -43,10 +47,6 @@ BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(Qt5Concurrent)
 BuildRequires:  cmake(Qt5Widgets)
 Recommends:     %{name}-lang
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 KFind allows you to search for directories and files.
@@ -54,7 +54,7 @@ KFind allows you to search for directories and files.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -71,15 +71,12 @@ KFind allows you to search for directories and files.
 
 %files
 %license LICENSES/*
-%{_kf5_debugdir}/*.categories
-%dir %{_kf5_appstreamdir}
-%dir %{_kf5_htmldir}
-%dir %{_kf5_htmldir}/en
 %doc %lang(en) %{_kf5_htmldir}/en/kfind/
 %doc %{_kf5_mandir}/man1/kfind.*
 %{_kf5_applicationsdir}/org.kde.kfind.desktop
 %{_kf5_appstreamdir}/org.kde.kfind.appdata.xml
 %{_kf5_bindir}/kfind
+%{_kf5_debugdir}/kfind.categories
 %{_kf5_iconsdir}/hicolor/*/apps/kfind.*
 
 %if %{with lang}