diff --git a/ktouch-21.03.90.tar.xz b/ktouch-21.03.90.tar.xz
deleted file mode 100644
index efcc5e8..0000000
--- a/ktouch-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fdd17889e2088b71d1876b1ce1dd76b1260d72625003421ecdcedd123eb4b8f9
-size 4942976
diff --git a/ktouch-21.03.90.tar.xz.sig b/ktouch-21.03.90.tar.xz.sig
deleted file mode 100644
index 4cd77ed..0000000
--- a/ktouch-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCr4ACgkQu0YzUNbv
-Me807A/9GLv5KorymMYcNWw/88yQVj7CMFylKg7o89NHYmDT3KSGaaTlMS8tSFnd
-AURValogaUx9VDRsssRmS7aaF+bIElU9JWYG7BNAR6zs93JCRtdoSldIZXfIKBQb
-+dLsMMwqEKqrcmyT4jFzxROnewwIBsDBEwamUhUR7K4t1C1EjgWIiw9M462X7yhw
-D+4KFsMThZbYttGR+IwEkCGQL/Xds7WlILwQ5ZpF2WkyMl3oP5ZhEmFNvRDcejVk
-wB70bUuO+BVn8SF7xv1TPsw2Omfkk2y+0IqdDtLsM8sNE8unpu0+zFka1qwSVIRw
-TkUpBiuGEZy7gGyecngifElZdgWCMhE6fhGWeL8V1l9AMj0koh7b+AOk6X8CpFx2
-CDKezyDxBgAbzmDbzDYcM74TmYcjEX+gEj//5qZEAweio2ygeKnmwD5L6WPtq9Cc
-nBFzWXtnozm7lcNZ9yOgxWUdU8HY1pV8Tb8bUVUcqyespSw8RCtAzWEha/PY9Kyw
-Albq0/a1aObzcuLvYB4MCWbtqIfiAbyIvUtnlge/cRP2uFRTBx3/aQXDnSO7UWig
-AEb6BYyVzU1LjrcjCzampBgoXvBXfmEZMK4gclTxT7AzoDIxVC4eywebGNj3kZ7V
-H6Oq3WHJXUORJgFH6PDGSgGHADg4pRodDlxBVcmP4AB2X744JM4=
-=xmsZ
------END PGP SIGNATURE-----
diff --git a/ktouch-21.04.0.tar.xz b/ktouch-21.04.0.tar.xz
new file mode 100644
index 0000000..c340ee1
--- /dev/null
+++ b/ktouch-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b58a6a8753de300798850091d8b0f577164884517f504d840b0fe3c7a46e8638
+size 4944184
diff --git a/ktouch-21.04.0.tar.xz.sig b/ktouch-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..4daf4fd
--- /dev/null
+++ b/ktouch-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwQACgkQu0YzUNbv
+Me/rIA//VgnS0S3FuzgmkYPDFEKw+U3S2vEg6iU7/Ae3bEiJhVxAC0GP975bPjj4
+i8jHjkY/UPZcXb3xM+YU99jv8KH4rEPVY8ekqJUYDPm60CsqXsQrs0lmxzQYsbnj
+kBGQzx7D2O6ogzsqsPPzzr8WCfAYTsIWxTJ2VkzCTBsfiUQ3vS/JeOmEWrvX3tvQ
+0eFonkZ4NOIXQjTPOePi3+1QVTeUKBUf1tIMxoqt5D1m3lgqcdCrjgNi7JQLvypV
+VnMqz+mmUUy4JEPlYfX45Xh7MqpBGBxh6jfQA2BfF3RSuIRQkft+G84EUZl92Iio
+QOes2rbGOBTymEVYHJiQp/lV9EkcyfgAVXD1t+Gy8YZtYQtJL6+j8+X6bb8ek8bn
+M8HcaKN/6MoiPPEA8O5stLq52xhqiexireU3VUkNcNf6A3dUEclcpIOvknuqJDSe
+n1HDuWcVfrzkuAVg9Zv5k8/nlGGtA0pxXJBCBSHhL9F6SJQVtrmk1ceHJilEyPLn
+ywMoxgwRD8/7wi5vg2nrD7Dzcrxucztu+Kyf+DB0XBaHO8TaYXhqnDUxM6EkCxI6
+f2F5uCL4APMR7ihS3DTAX6/5+ydxqj1BlYJFjz2MDHJS93PY1+ahHgRj7k3/qcl7
+my7Q5kfjoM2aejI2p5yBhXnWhcE+cFQaX748g33CW72kglbOGHE=
+=4pLe
+-----END PGP SIGNATURE-----
diff --git a/ktouch.changes b/ktouch.changes
index f319af8..73f5d9a 100644
--- a/ktouch.changes
+++ b/ktouch.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:47 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
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
 -------------------------------------------------------------------
 Fri Apr  9 17:41:13 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/ktouch.spec b/ktouch.spec
index 5bf9113..dc9b959 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           ktouch
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Touch Typing Tutor
 License:        GPL-2.0-or-later
 Group:          Amusements/Teaching/Other
-URL:            https://edu.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/ktouch
+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:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  xz
@@ -64,10 +68,6 @@ Requires:       kqtquickcharts
 Requires:       libqt5-qtquickcontrols2
 Provides:       kde4-ktouch = 4.3.0
 Obsoletes:      kde4-ktouch < 4.3.0
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 Recommends:     %{name}-lang
 
 %description
@@ -76,7 +76,7 @@ A KDE program that helps you to learn and practice touch typing.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %ifarch ppc ppc64
@@ -96,8 +96,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %files
 %license COPYING*
 %doc AUTHORS README.md
-%dir %{_kf5_appstreamdir}
-%dir %{_kf5_configkcfgdir}
 %doc %lang(en) %{_kf5_htmldir}/en/ktouch/
 %{_kf5_applicationsdir}/org.kde.ktouch.desktop
 %{_kf5_appsdir}/ktouch/