diff --git a/kfind-20.12.3.tar.xz b/kfind-20.12.3.tar.xz
deleted file mode 100644
index 4d1b38c..0000000
--- a/kfind-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6f608fcd717021bc2f4c69def81f18361c05abb72503deb268d219fb8a6f167
-size 278656
diff --git a/kfind-20.12.3.tar.xz.sig b/kfind-20.12.3.tar.xz.sig
deleted file mode 100644
index 021d624..0000000
--- a/kfind-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEEACgkQu0YzUNbv
-Me8RYg//UKwXNFhJB+Q+JsXHtwrf6P4PvwqOE5sxIWxBpdFf56GD8QYQJ+87Nitq
-W4FKix4xL40qmUrI7gjUuN5SkHzgqBjFlqlvrOVznZfFGLYB9T4uSyiybFov26yu
-E4AHFv+dpyfySMXwu6PfOXx5SmWsdu5kCWLCBdVAdVywnc8S4LD+KIn5knlE9co6
-8BR98iZj3d0VdcQEQC2fgd6ffRkIFCdNCNiOn452hLlqhM2ESwiIb1L1VyXnegdF
-yBlmY13l69e0CXFyZ42Sm+Onhh9HgPdEd2TvnB7crSpYM6t2+2hX5QQz944gxzcA
-J5a7G+q1bkX1p/vzWKgwu4SjWCWdaIIdlpv7ixS/QvgwQRYp7X3HvS6AlLZGV2uB
-PTB85tAEkvUfz4TaPPvJMhpURs8AYbaYngIpiWiwEyBbgirt3UinA7gnuE9ihjbB
-6vM+xDL5JggZFTKy6bGZM7eSMHu3PxI+vdOgFJB160xTzQ5UUhXXn1fm6P9VDzMP
-MdJvayBlkNZrGdvO5lwh3/78Tk78qxdC00v5DHmZvvjQ7ts70G9Nw+kyce9GXkDC
-mByKG4kqt+E+fPxfYj8QzJSdNt5oh0BSbV9gkE/+GGz+7wpBl41Gs+cJCPWD1qjv
-3SJCf5PGaYxK641dOMLFVRGtH/dB/hFfWUdpUasPoJTN0MfmmlM=
-=gGKW
------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 b7d826f..587cec8 100644
--- a/kfind.changes
+++ b/kfind.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+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/gear/21.04
+- 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>
+
+- Update to 21.03.90
+  * New feature release
+- No code change since 21.03.80
+
+-------------------------------------------------------------------
+Sun Mar 21 13:28:00 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Convert license statements to SPDX expressions
+  * Autogenerate categories file
+  * Bump min Qt/KF versions to 5.12/5.68
+  * operator+/- is disabled for QFlags in qt6
+
 -------------------------------------------------------------------
 Thu Mar  4 06:10:17 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kfind.spec b/kfind.spec
index 7e71bb7..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:        20.12.3
+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/
+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/stable/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
@@ -70,21 +70,18 @@ KFind allows you to search for directories and files.
   %suse_update_desktop_file org.kde.kfind          System Filesystem core
 
 %files
-%license COPYING*
-%{_kf5_debugdir}/*.categories
-%dir %{_kf5_appstreamdir}
-%dir %{_kf5_htmldir}
-%dir %{_kf5_htmldir}/en
+%license LICENSES/*
 %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}
 %files lang -f %{name}.lang
-%license COPYING*
+%license LICENSES/*
 %endif
 
 %changelog