diff --git a/kblocks-21.03.90.tar.xz b/kblocks-21.03.90.tar.xz
deleted file mode 100644
index abe402f..0000000
--- a/kblocks-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0258aa43a22912e0129e008ff380bacd15905ae62afac8cc2ea97d4cf69c107d
-size 1910548
diff --git a/kblocks-21.03.90.tar.xz.sig b/kblocks-21.03.90.tar.xz.sig
deleted file mode 100644
index acf6206..0000000
--- a/kblocks-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCroACgkQu0YzUNbv
-Me+qMQ/+OIBiS+rtGeDExAsp7P5ncWzKyMIq9QL0GzXJWxTYKE/r6mAzohX5wHp3
-LuH3XMDpwEHz1HBI2EsRbIdu8xSyvvLoi9Lbb1VHyPiShwR/CL3+crSWVkOr0WF0
-dHdU0FxtIY7eE+BgMW3avyGlXEBBaotZxGOPT26swZU+nXq64jgu3jNFlXxzY7+o
-EbuuI1Z1BM2WA9Qf/vQuevBPzjl8oJkKS4FZYJoUF/+QUN+BmybvkXVfrsdMuP9b
-72Oq57T3rjcxzABh1acpmPPxC2kCz1NTxiPPC90OHxhx5AQR9o/uOwYBxVTGfcCX
-bG5zd6nKVsv3iMstX4QwCD3L0GGi6FhvEfKpWpqZT+uvyiAdmeEJLKkgGYJOdt71
-N9O5vYUx0nM8MiQR+N8nbO8FHBfkQZB/GT7GFrWeLvlaXdi5H5kfwJFn0Zj/z7mU
-96XijKPNDgTo9Guq+ezO1t/Q7TBg50TRhF6FL3IkCXW8MIod64qmEFX3+FCk7Ye8
-uzefuIDjQH/Ezf47QrbbiMWb9KTZlYQ1OPFHk/hxWKwPjESTsAyAErI3nAZWPrJL
-vs84JhQU/ZSZOvwM9DUcOEfiq9zhnfToLLmU9r59gPaBGa9E3NcLJ47VHHumr4bf
-ROG0WFH8MWKPcu7SjUyaEkn6Q/Hks7x/J8j/Itd9Cib0ZNucdco=
-=yGdg
------END PGP SIGNATURE-----
diff --git a/kblocks-21.04.0.tar.xz b/kblocks-21.04.0.tar.xz
new file mode 100644
index 0000000..f736c7b
--- /dev/null
+++ b/kblocks-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f678d652875cdad8612fc572ad86970a716e7701c9d246fdf6a621fda3232206
+size 1910768
diff --git a/kblocks-21.04.0.tar.xz.sig b/kblocks-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..1641552
--- /dev/null
+++ b/kblocks-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvYACgkQu0YzUNbv
+Me+ypRAAgPk3Ja4rhCQiWdWnrjSbvzTr5ARobi0owHPKz0sQfZhuMn6vDU8WX68S
+ygVs7Psz80BT9BI2gLev08mMi7Cdd3rpQka/6oadTaTjdCJlTSm536PqrzTgN7ai
+N+JSIPk5Yy02hb21uD6NGy8jfvTsv4HOpRc+iCVjXDYmpYI1R+O+oKrjBxRavmO1
+yCpt1G+4mypg2rZeC/dJWgFyVQwREoMW0LJRHQWzxXg+2+MrTV4owM7ey4d5jFfl
+9HH0PzG4LHN+cJRxooAUl1Zs8bpOw8gVknfbkwfcGMpr6HQJtrt5V8OysYpw95mf
+eBtX4vasjVoJ8rrl/Q5hh/XFKFgvyWyAhu/DCjDl5I60DWWcpZdhGXbctwzzXgZZ
+Bm9Okd7lsJEHVAUmDXGtc1JxJ4NjRW+t3vlTjk5AmjvieU7bOV5nvNL+4xOwiB7q
+RslgecUaeysfgflNHzau5jvaZnWfdGj7fRBQ7s+aoZA8Ts67k6TNYl1xRbVNRGSF
+5TzK3CWQp7EKwnd3BleJeiyCv1nbo9lYDn54hgLw2c2rrcN3hoiKEfUTXACa9XHy
+XMwecVwWebtBSiOhuUTdvkhq2CsfqIV3BHRA3ZijUy5JSg8ZLfWlmgKX9FSQyPJC
+WbAQeLjWOjgExpSU4KcCcaANIyc9ovNEqi7Sy1NuPnkN8RwF35U=
+=iwSe
+-----END PGP SIGNATURE-----
diff --git a/kblocks.changes b/kblocks.changes
index 1b7e905..69586ab 100644
--- a/kblocks.changes
+++ b/kblocks.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:30 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:
+  * remove reference to obsolete part
+  * use kde extension in snap
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
 -------------------------------------------------------------------
 Fri Apr  9 17:39:56 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kblocks.spec b/kblocks.spec
index 40a8bea..b824d6f 100644
--- a/kblocks.spec
+++ b/kblocks.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           kblocks
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        A classic falling blocks game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Strategy/Real Time
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/kblocks
+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:  update-desktop-files
 BuildRequires:  cmake(KF5Config)
@@ -52,10 +56,6 @@ BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
 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
 Recommends:     %{name}-lang
 
 %description
@@ -64,7 +64,7 @@ KBlocks is the KDE version of the classic falling blocks game.
 %lang_package
 
 %prep
-%setup -q -n kblocks-%{version}
+%autosetup -p1 -n kblocks-%{version}
 
 %build
   %cmake_kf5 -d build
@@ -79,18 +79,16 @@ KBlocks is the KDE version of the classic falling blocks game.
 
 %files
 %license COPYING COPYING.DOC
-%dir %{_kf5_appstreamdir}
-%dir %{_kf5_configkcfgdir}
+%doc %lang(en) %{_kf5_htmldir}/en/kblocks/
 %{_kf5_applicationsdir}/org.kde.kblocks.desktop
 %{_kf5_appsdir}/kblocks/
 %{_kf5_appstreamdir}/org.kde.kblocks.appdata.xml
 %{_kf5_bindir}/kblocks
-%{_kf5_knsrcfilesdir}//kblocks.knsrc
 %{_kf5_configkcfgdir}/kblocks.kcfg
-%doc %lang(en) %{_kf5_htmldir}/en/kblocks/
-%{_kf5_iconsdir}/hicolor/*/*/kblocks.*
-%{_kf5_kxmlguidir}/kblocks/
 %{_kf5_debugdir}/kblocks.categories
+%{_kf5_iconsdir}/hicolor/*/*/kblocks.*
+%{_kf5_knsrcfilesdir}//kblocks.knsrc
+%{_kf5_kxmlguidir}/kblocks/
 
 %if %{with lang}
 %files lang -f %{name}.lang