diff --git a/umbrello-21.03.90.tar.xz b/umbrello-21.03.90.tar.xz
deleted file mode 100644
index cb47bfe..0000000
--- a/umbrello-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:160f717db0768585d7dcbe7943e98103168156d25b9092dcd2bbbd4a4def3775
-size 5568364
diff --git a/umbrello-21.03.90.tar.xz.sig b/umbrello-21.03.90.tar.xz.sig
deleted file mode 100644
index e855fd8..0000000
--- a/umbrello-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsEACgkQu0YzUNbv
-Me80Ig/+MHnWnvT0FCykSAJKuW2wtWHZ6jjjG05jNuqDMdvXIXZlkmnPd2t15vXl
-y777ITlNhYEb5LNurMJd4oxcfA8CIAYO2/BHgNhRtof/3o0gSQYwRH79MZkvleqD
-7Tfca/09K+XIrcuFvQRsWbWq4+Qb/nudI/KrfACJ6EunmbaGMVDzHv87ELKj3BXm
-M8Ft1hLyMgPz0Eb10bxq1wHOYH031aO9i3DX+6Xc9f9dkl5mYwKIggyh3Xh2QYqQ
-45kdeudXQZXJGgKzC3NK2ZkyerKmWy7AaxnF6jPWiI9zoIRk4GodJPBXs8jGlzAm
-o9wch8CdWoGld4EOBfVihEYCLHQMNGP7IuXPz0NmSEqWDXdxk0v8Sd2sKPH6lq7k
-nMhmS2yR5Ysu06LbabJ6jhGRbApdv/vciuar/yTmhc5oij2QFjsLNWHWsoQ+E3vA
-fyG0T2LxgYyg1Y0bbmV7XkbW65oabp0XbuQVZ4gLFlVCttIl0ONhlpTHYDQAr7UQ
-js58RCbY6jJrDnSNdjRzmCGLSYr4RJEwCOSvQ9jePouJaF/OEh6JZn1qwUezhgB7
-Eo604yXhUCBavEUDKUrgKb/LrdM809R+Vzte3Vzk+MWWpS/49yB9Xe6rdMGSTCeP
-X+Z/QJQanh0V6Tj5Qt/KHWi4sgj6aAyjOApx3pFO85TsdNgaopY=
-=OVOq
------END PGP SIGNATURE-----
diff --git a/umbrello-21.04.0.tar.xz b/umbrello-21.04.0.tar.xz
new file mode 100644
index 0000000..f0be7b2
--- /dev/null
+++ b/umbrello-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d5f7c637a59a68a1ee3c15f3c992a38f0a75671a407b299a64fc01b98d4bc9f
+size 5568700
diff --git a/umbrello-21.04.0.tar.xz.sig b/umbrello-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..adc203d
--- /dev/null
+++ b/umbrello-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwsACgkQu0YzUNbv
+Me/L0g/9GIsoWohMhQEiMsasUWAvVJqo0n7B5RSJLgI/p8OX8r+m7yE40tvTvfTe
+/HhKAqQuApxynUrLG/AilH/MGopWFp10GXSefTop/JdLfXZwmLNcp5O8bV0UIjKS
+AhpTFknpcqZzNTVN2CZPF9GYeIjr4tU1lU9fe4uj0Dp8nIAViKm7vqTqEHO5qJDy
++NuT+7SPr/BShD7Ria/bfKCejum6LpRxP1BrgjHyRG20Saa8DEsgTi6wKUfru3Gc
+Q5aRk8QjsscAHeRHjTLhUsacSNrnYyx7mPnplIW+d8u0gn624ILmha9N3d7gUEg1
+8awzAwyLIoqPRJyKnwSTtMOHwxid8qB1bU4EnFa75PeuXRSW2jmSHet6fp0gwVD0
+C2rLjeOO1MJhAbaidWBLdQ0QxPXc8MKRpVFofzyd++eDzXQUPeX1oed4hE4KoQ5u
+1SKlWP1vNbiy/gkWN8TGrmjUkbEjRtcIfM+bKxzyR9ZDYS5XBT2Hwj3fDzKjafow
+5AZYRe48dR80lJMOeUyKxo5OguSNH9JR9aF/dLUrCDKaGIsrWL7kbgd2s8u4BQUC
+mAf/rblL0IZ3vDVlYBzhqgIquul2k7dVm/Cm1aYliSIeJ5NTrUA5eo3oGvAiS3nx
+50kJWz8A45bI9/QhIRBLVBF/4Ih2ckxI0ad7O5zVy57+sEMecgw=
+=nV1e
+-----END PGP SIGNATURE-----
diff --git a/umbrello.changes b/umbrello.changes
index 73d98c4..1ca2e02 100644
--- a/umbrello.changes
+++ b/umbrello.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:29 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:54 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/umbrello.spec b/umbrello.spec
index 05287d3..bc598d0 100644
--- a/umbrello.spec
+++ b/umbrello.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without  lang
 Name:           umbrello
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        UML Modeller
 License:        GPL-2.0-only AND GFDL-1.2-only AND GPL-3.0-or-later
 Group:          Development/Tools/Other
-URL:            https://www.kde.org/
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/umbrello
+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:  kdevelop5-pg-qt
 BuildRequires:  kdevplatform-devel
@@ -62,10 +66,6 @@ BuildRequires:  cmake(Qt5Xml)
 Recommends:     %{name}-lang
 Obsoletes:      umbrello5 < %{version}
 Provides:       umbrello5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 Umbrello is a UML modelling application.
@@ -73,7 +73,7 @@ Umbrello is a UML modelling application.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %ifarch ppc64
@@ -96,7 +96,6 @@ export CFLAGS="%{optflags} -fPIC"
 %files
 %license COPYING COPYING.DOC
 %doc README
-%dir %{_kf5_appstreamdir}
 %doc %lang(en) %{_kf5_htmldir}/en/umbrello
 %{_kf5_applicationsdir}/org.kde.umbrello.desktop
 %{_kf5_appstreamdir}/org.kde.umbrello.appdata.xml