diff --git a/kate-21.03.90.tar.xz b/kate-21.03.90.tar.xz
deleted file mode 100644
index ab055af..0000000
--- a/kate-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:805f919d30337150e65333b97b65a17844bcaf13c5153041c4e0456cdb5d1362
-size 6939256
diff --git a/kate-21.03.90.tar.xz.sig b/kate-21.03.90.tar.xz.sig
deleted file mode 100644
index e581dce..0000000
--- a/kate-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCroACgkQu0YzUNbv
-Me/OyQ/8DWfwPusBEMF6q21bEgxLJlZSoferftfWqMf8PklFsNNtNhDgAx/lJpal
-DhZmyW74aN/uh11RcTcxT2awALeo5vES1P+R8jTBAcZZmFoB6cuMpJN7HMpSLhJ3
-hWkmdfZPPIO0VRd5DdwPpM4qDNNkyUTw8cNIV1Iqmvg/wI5N59JQ6gg9TrkL+TgF
-U+Y7v3ZgI66Y43nkPBXtf2Sqvg1/g5/+8okU/vjkkZANmA9phRs5ngAATeOhUDQN
-xMynoy9U4EVLxOnnPFhw6bK3kjEjavSYjCfapRsyUPIIn6E7gX2vws8yEZyEeimp
-ddKotjDEdnRJlzAAlXT1ApU90l7NKuaJj0uv6ZRWLkNz7sm82JQ8NJqwc/E6n8BY
-8++jh+bXpjbqo+tU/0JeA229bF6r4UWTPLwIBUDEgZCZqSinSFfmJs3mn0vakze2
-t5wBDOXNszszEGphZs1HZxEJJil7GXD1W9iiBwExUB6i48QUh5Huoj8ABCZDFdbn
-QXQlGSG/lUSP1XwQxtpLrKooIL4+k5E8lrmCELHGGCnNkwc0M8T6gTGgSo/raPNc
-Cm6q5kOvWhEWlgf7BAjAV20oSL8v9iRp5Ar8V9FVdSVUXbpT5pU/ALFFu1QxcBae
-4mTTzeeSFoFydxu+85SNe6aee5JAd29ykkL3g89boA9TOnAoxpY=
-=Y0HN
------END PGP SIGNATURE-----
diff --git a/kate-21.04.0.tar.xz b/kate-21.04.0.tar.xz
new file mode 100644
index 0000000..1230a98
--- /dev/null
+++ b/kate-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3780cc0de0cf078add7901e255a6524c34f093a4aff2a2d032ed88c20a7421d4
+size 6940360
diff --git a/kate-21.04.0.tar.xz.sig b/kate-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..ac85c7d
--- /dev/null
+++ b/kate-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvYACgkQu0YzUNbv
+Me/4JQ/6AwuanngMVesF9qHhXvOV2xNw54hUyX2RNWNAlQgNL7hPI6DqbmMdZTaA
+uBmBlIx1bgAnWCJ2TuvzJGgOKyrUZWKngvnTU1KI+0JwLAp8v1Hgta7G2TkvVy9o
+qbgeFEeWAhYoP0yADmSt2ncBmeeBNTVIb9ssIufQfJEXHI3RcmiZmFrJhXjYUx2V
+oeJ6LSfRBInyxNKZO5ZRbhhxeJVlkY8eNCa39AawN+T/JeCVKsVpcGxXlGJTiRFR
+/OdjS05yG4WqoauKpwm8ngjttFcR0Vh/ocu1b/KIV3miu3RLbvBnB8+qtdxCospx
+2DRG1py9w1ekRgTdmvloW5esCleoqDSHU0EfCDyPcXZOvR4gqQpgitxB9uzU2XAq
+MwWSNS9WOKkRSr7Gl+BZl5Q/qaNjvG6KZaWilzC9h8E4TzUIfaWnoiWF/eL7C5g4
+rpYD96lhSjxea+zazCpBL69IicauJ9rQDDyz4Pi9g0mNfzHfp0hhOwFSn6fyfKiZ
+3mIHHD1fafuntC7fj6DIH/3kfkHhEAS1382xlJ2sZ9LndhWIryg/tHToxaXmxnWt
+nn/c3X7BlUDupQ4DhEH1XEtVKRI4O5KFVUXCMbcI0Ej11pIB7+Jgida1Wc9TydcE
+S18FSC0+ZEHtMuGgR5KYN9Q1eSx4+ZwA0PguUV1n1TJdEObcS70=
+=2hUO
+-----END PGP SIGNATURE-----
diff --git a/kate.changes b/kate.changes
index dfc3995..e28b466 100644
--- a/kate.changes
+++ b/kate.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:27 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 S&R not recovering from canceled folder search (kde#435689)
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
 -------------------------------------------------------------------
 Fri Apr  9 17:39:53 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kate.spec b/kate.spec
index 21c0583..f8225b6 100644
--- a/kate.spec
+++ b/kate.spec
@@ -22,13 +22,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kate
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Advanced Text Editor
 License:        GPL-3.0-or-later
 Group:          Productivity/Text/Editors
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://kate-editor.org
+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
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Defuse-root-block.patch
 BuildRequires:  libgit2-devel
@@ -64,13 +68,9 @@ Requires:       %{name}-plugins = %{version}
 Recommends:     %{name}-lang
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
-Kate is an advanced text editor for KDE.
+Kate is an advanced text editor by KDE.
 
 %package -n kwrite
 Summary:        KDE Text Editor
@@ -79,7 +79,7 @@ Requires:       %{name}-plugins = %{version}
 Obsoletes:      kwrite5 < %{version}
 
 %description -n kwrite
-KWrite is the default text editor of the K desktop environment.
+KWrite is a text editor by KDE.
 
 %package plugins
 Summary:        KDE Text Editor plugins
@@ -89,14 +89,13 @@ Provides:       ktexteditorpreviewplugin = %{version}
 Obsoletes:      ktexteditorpreviewplugin < %{version}
 
 %description plugins
-Kate is an advanced text editor for KDE. This package contains
+Kate is an advanced text editor by KDE. This package contains
 plugins and data files for Kate and KWrite editors.
 
 %lang_package
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -112,9 +111,6 @@ plugins and data files for Kate and KWrite editors.
 %files
 %license LICENSES/*
 %doc README*
-%dir %{_kf5_appstreamdir}
-%dir %{_kf5_htmldir}
-%dir %{_kf5_htmldir}/en
 %dir %{_kf5_iconsdir}/hicolor/150x150/
 %dir %{_kf5_iconsdir}/hicolor/150x150/apps
 %dir %{_kf5_iconsdir}/hicolor/310x310/
@@ -136,8 +132,6 @@ plugins and data files for Kate and KWrite editors.
 %files -n kwrite
 %license LICENSES/*
 %doc README*
-%dir %{_kf5_htmldir}
-%dir %{_kf5_htmldir}/en
 %doc %lang(en) %{_kf5_htmldir}/en/kwrite/
 %{_kf5_applicationsdir}/org.kde.kwrite.desktop
 %{_kf5_appstreamdir}/org.kde.kwrite.appdata.xml