diff --git a/marble-21.03.90.tar.xz b/marble-21.03.90.tar.xz
deleted file mode 100644
index d91801a..0000000
--- a/marble-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:328b04ad70bd8b0db419229277bc4da167a926ec3dd7968449fb60e4a9828ad9
-size 52373884
diff --git a/marble-21.03.90.tar.xz.sig b/marble-21.03.90.tar.xz.sig
deleted file mode 100644
index f808046..0000000
--- a/marble-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsAACgkQu0YzUNbv
-Me/8HhAAhl3RWtrjP1oUnP7SIuz4yPwCCRgHm2ZsBwR29ZZvaaABglOAffJSV5bu
-443JiN6kfsW8xwi8hD8c5xoz1haWIC1nAIPpOu6PkDxf1zFidvHIk1uFe227FPWR
-75EWwGKHJY2NMmHNjR5xmjvZ+8QHLOgZlM8PfGG5smwqg5QuFOB2N4phQTu+StU1
-UC1gcaIkiqa8L80ingEyrlNARV+0cWofaOF0Hm2H0WNUubEiSfX+3PWMbu8L0dF/
-WIirgD0oUeuKniUqNjkY7SE8v3+omBezUzyQfUzTVjBqoqux63Yiflyphx7MkL7U
-9xo1VryONrJL5JJsiw+vXKYShYM9A66+L04tUdF8OAyLtfy2BUE/UnijMTP1aCmV
-eNMReSNZt4EekLNYpVrgciQ4smWtxOAF2AEh8zW+l8bWEDWmSaY/fFeVv//756ep
-jf3F3DdIpmkzDsquheK+A7G01q78qXHckjdLE6i49kdO6o5JIaMzev3VZe040SBw
-Tjny41+e25o7EM3RLL0yp79MwLf6gmo19dPkxYi1+ef38M8sOAMp68evh5rj4XoD
-POvtICgLdsNaXMXrNnteHd95ePM8okzY582EkNZawQskXoPDm+8S5I6kEb6iOKG8
-ZknG+OgCJ9IgRO16U33qtm17scGH2L3Dxgu0x2bG+/XjQVJBNQ0=
-=+Pxs
------END PGP SIGNATURE-----
diff --git a/marble-21.04.0.tar.xz b/marble-21.04.0.tar.xz
new file mode 100644
index 0000000..3b755f5
--- /dev/null
+++ b/marble-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:187efcf9976f7e478a5420f5c4fd7ca73782b9bff58626e37e78c2efcae9c3b0
+size 52373900
diff --git a/marble-21.04.0.tar.xz.sig b/marble-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..dc11e26
--- /dev/null
+++ b/marble-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwkACgkQu0YzUNbv
+Me8BCw/+OMor5CMsRZxk0D2mg0eAQl3kd6LOKlOxKMuWLw2wggS6VLVKvMrSmM6V
+9Biy29ubULRqLLIlGvppVi8J8tKOmcgqTmkP/h1xQAT4ro2p1XAvMyDSn9O2ij9d
+0xzersVV92uuoJl3Zr6UKACG8Vt4aOkc+80mhMCYHGk7De5MSB1rlVMQWbFogUbn
+9qZ732LYirLVFaGwshvVMbzyWq1qwGbCAGs2qGOjarNs+pKV0+ir8tjbyVQ2uAJf
+SE5fN4RWjCCadPImfqhSJQtCq42WeUTwpBKDo13DlhpgFUEV8z0UafzpAmxVG00/
+WXtk+0bW7WPnXQ+vEtpyy2Do4EZyu4PmP7KUT1IdgFGqisuLeMbNZ0PpHi/YxN9Q
+30dazrbBIiBgOCZ2maLLlnS6xj8wI1zKXdv6Yxb+h3GbKYg7+RNdAo6W65INCmz4
+0Ut9V3DiGYD6aOZAHdBTKR1PVp4kRzNXoatTI454hkpgxEYLsDSCIrVQR++f1Ep0
+h1dmrFkVUobKOc5XJrIdXYBK//KbciJXdDKfhk4s5Y0UNjvwGIMIlpy/dkduymTK
+CJAp4wKWHYc7i4m+beVcpV4fcpF5RibwTym715p0EBUORKFsiFP+Q8JyxkGeL9Yf
+tj+gpL4atYP6IednNqUj+ekTGcgiZ7fMg4wm2g94hiFjBYYcVyQ=
+=2u3l
+-----END PGP SIGNATURE-----
diff --git a/marble.changes b/marble.changes
index ee7353d..2c818cb 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:15 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:40 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/marble.spec b/marble.spec
index f8bfe10..8f368ce 100644
--- a/marble.spec
+++ b/marble.spec
@@ -23,14 +23,18 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           marble
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Generic map viewer
 # License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package
 License:        LGPL-2.1-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/marble
+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:  gpsd-devel
@@ -74,10 +78,6 @@ Recommends:     %{name}-doc = %{version}
 Recommends:     %{name}-lang
 Obsoletes:      marble5 < %{version}
 Provides:       marble5 < %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64
 # Only include WebEngine on platforms where it is available
 BuildRequires:  cmake(Qt5WebEngineWidgets)
@@ -165,7 +165,7 @@ The astronomy library for the satellites plugin.
 %lang_package
 
 %prep
-%setup -q -n marble-%{version}
+%autosetup -p1 -n marble-%{version}
 
 %build
 export SUSE_ASNEEDED=0
@@ -193,6 +193,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %doc CREDITS ChangeLog MANIFESTO.txt
 %{_kf5_knsrcfilesdir}/marble.knsrc
 %exclude %{_datadir}/marble/data
+%dir %{_kf5_plugindir}/kf5/
+%dir %{_kf5_plugindir}/kf5/krunner/
 %{_kf5_applicationsdir}/marble_geo.desktop
 %{_kf5_applicationsdir}/marble_geojson.desktop
 %{_kf5_applicationsdir}/marble_gpx.desktop
@@ -200,17 +202,17 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %{_kf5_applicationsdir}/marble_kmz.desktop
 %{_kf5_applicationsdir}/marble_shp.desktop
 %{_kf5_applicationsdir}/marble_worldwind.desktop
-%{_kf5_appstreamdir}/
-%{_kf5_configkcfgdir}/
+%{_kf5_appstreamdir}/org.kde.marble.appdata.xml
+%{_kf5_appstreamdir}/org.kde.plasma.worldclock.appdata.xml
+%{_kf5_appstreamdir}/org.kde.plasma.worldmap.appdata.xml
+%{_kf5_configkcfgdir}/marble.kcfg
 %{_kf5_iconsdir}/hicolor/*/apps/marble.*
 %{_kf5_kxmlguidir}/marble/
 %{_kf5_libdir}/libmarbledeclarative.so
 %{_kf5_libdir}/marble/
 %{_kf5_plugindir}/designer/
-%{_kf5_plugindir}/libmarble*so
-%dir %{_kf5_plugindir}/kf5/
-%dir %{_kf5_plugindir}/kf5/krunner/
 %{_kf5_plugindir}/kf5/krunner/plasma_runner_marble.so
+%{_kf5_plugindir}/libmarble*so
 %{_kf5_plugindir}/marblethumbnail.so
 %{_kf5_qmldir}/org/kde/marble/
 %{_kf5_servicesdir}/*desktop