diff --git a/kwordquiz-21.03.90.tar.xz b/kwordquiz-21.03.90.tar.xz
deleted file mode 100644
index ffaebde..0000000
--- a/kwordquiz-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:868142b65089f555645432fe06e1e62edbf338684f8efec7bd92cdf8ae463629
-size 4189280
diff --git a/kwordquiz-21.03.90.tar.xz.sig b/kwordquiz-21.03.90.tar.xz.sig
deleted file mode 100644
index 47329e5..0000000
--- a/kwordquiz-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCr8ACgkQu0YzUNbv
-Me87uw//XyMGV65hpKUib7l/5q4PY8YT472vvAF/3HVD7Z53m64FjBTqLt/GrEqc
-uk4t3k9Tifsuqa3x6xWzWv1nYFgjugXmczGrnrTCfDJN7Uoay9el+/sUYtJkYfBG
-flHVxKwlQKrEe9/jQL+u2BOm1wilYU266hWHAFisTFgRC3zOfc5wk5p8xco0WCVO
-r2VbA+CXSelpwXerMVWxTYZaalLQoHKU5JxOTNZKkutcuZte+VZ9NFF87mB1+2U9
-TbnAv9Nd9zjcYtns5m1rY8RSZNQxrE0Ovn0lSf4Rr+NIJvNoR1WoI6vpUY/myVFw
-abNfcT6189R+39jqbrasl8v04A/1VG/MVCigZka6Ewce35+l3YjHmgbG+75QEboq
-YIXvnrV5SBfduqAlcdrX0X/+OcnMtb1TJMiHoPhDATu8F3GpzZfVIB+G41XImAxm
-z6HjGo3jciro/on4vKokwxs+ouCXNZRi/TAbkqAdGUsob4WZ9ezDKECq+3lbrd0N
-JN/kmvHLZk2Fj4G13C0TK8+Y4KwyVLB9kDx/w6A2fWdlTgEdHWYGX81ogvqUDG4I
-pnEdLLihzyacRnl8eUGc5hRgRCsPB9jv8VXKCnDxhL2VQ4bCe3IUQ1m64cjj50uJ
-3GVlvnDp/IvAtVaVYaNocHVP0+y98n3omY8hsApK/gVIubUc+h8=
-=baBS
------END PGP SIGNATURE-----
diff --git a/kwordquiz-21.04.0.tar.xz b/kwordquiz-21.04.0.tar.xz
new file mode 100644
index 0000000..e647677
--- /dev/null
+++ b/kwordquiz-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7127b4a4873ab2bfae3bc05b6e4486dcbb35b701286f1086141f6e5f8e85d172
+size 4189888
diff --git a/kwordquiz-21.04.0.tar.xz.sig b/kwordquiz-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..89521c0
--- /dev/null
+++ b/kwordquiz-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwYACgkQu0YzUNbv
+Me8yTA//c2ZsvjrC8UUIRmN8/+9CXQXcB19Y1q+Iu6AtVixuvI5MuD4fKpaam801
+v5Hrn+JeuwU3Z7rLjYl1q3trLSfAHEvy3G66q+OHYUoedBb4ZDTvgvQHSuX/v/wz
+s5SGHkr4uvC9ko2kzbb/PelLWZeCj50fOaoTpkJ4yOyw3wmrJhUeryF2xwxrGsJU
+VVfrFBpPs845Ep3OVhkGN95QVyWVAhjTYvo0LCQlInztxMcgUsDmakd/ac11qkXb
+Z/AnzamavHZZeHdMr+SdGgDn8nwVeZlJh4Yiv/Ub7UFet4nbcEVbRDBsf+9JVw3L
+sGvM9Zzi/ZVRP9PiICg3sbuOXCdpYf+iVadCn5JDXNQfTpY4ZzjTr8KRFsLxCmq6
+pIDJfwIOq3uAsG3aj/8mKSKeQ9VtwWSBQ38xnWYQ3dBmFlNOUKAbpizKcfrlJ7Sa
+GoB2agBdBFxhS+hUnKDThh/WPc3QeAkhrt5+5G0V9lRFaTL4fV9SxWPAvZzeGQeP
+S/bkNojSWp0+oCa2kJoiHYX3h4cMXsv/mXJ3hwnF2brglvEdK6DYx8DMj9l5s0iW
+8fASqhbf+ZsyPCR9hw1THuXg+GvmRwSsMh3K5lmZvxh/P/scXnhcbtVxWWUhuKzr
+640vloj6bo+MM4rteFF469BDR+49EX6KiqQdIpGgKQ8vcub4Yiw=
+=0qIn
+-----END PGP SIGNATURE-----
diff --git a/kwordquiz.changes b/kwordquiz.changes
index 30d1b63..850ae8e 100644
--- a/kwordquiz.changes
+++ b/kwordquiz.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:00 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:26 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kwordquiz.spec b/kwordquiz.spec
index 614a42b..5663a35 100644
--- a/kwordquiz.spec
+++ b/kwordquiz.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kwordquiz
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Vocabulary Trainer
 License:        GPL-2.0-or-later
 Group:          Amusements/Teaching/Language
-URL:            https://edu.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/kwordquiz
+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:  fdupes
 BuildRequires:  cmake(KF5Config)
@@ -51,10 +55,6 @@ BuildRequires:  cmake(Qt5Widgets)
 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
 A flashcard and vocabulary learning program.
@@ -62,7 +62,7 @@ A flashcard and vocabulary learning program.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %ifarch ppc ppc64
@@ -80,10 +80,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
   %fdupes -s %{buildroot}
 
 %files
-%dir %{_kf5_appstreamdir}
 %license COPYING*
 %doc AUTHORS README
-%{_kf5_knsrcfilesdir}/kwordquiz.knsrc
 %doc %lang(en) %{_kf5_htmldir}/en/kwordquiz/
 %{_kf5_applicationsdir}/org.kde.kwordquiz.desktop
 %{_kf5_appsdir}/kwordquiz/
@@ -92,8 +90,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %{_kf5_configkcfgdir}/
 %{_kf5_iconsdir}/hicolor/*/apps/kwordquiz.*
 %{_kf5_iconsdir}/hicolor/*/mimetypes/application-x-kwordquiz.png
-%{_kf5_sharedir}/knotifications5/
+%{_kf5_knsrcfilesdir}/kwordquiz.knsrc
 %{_kf5_kxmlguidir}/kwordquiz/
+%{_kf5_sharedir}/knotifications5/
 
 %if %{with lang}
 %files lang -f %{name}.lang