diff --git a/umbrello-20.12.3.tar.xz b/umbrello-20.12.3.tar.xz
deleted file mode 100644
index 5f7d240..0000000
--- a/umbrello-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57fb7d988e115be18514f807bab483a19877acc3f1910aeb952c4d8372f4d378
-size 5555804
diff --git a/umbrello-20.12.3.tar.xz.sig b/umbrello-20.12.3.tar.xz.sig
deleted file mode 100644
index 7cb2e1a..0000000
--- a/umbrello-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEgACgkQu0YzUNbv
-Me8Vww/+M6ZvgPGC/j9QeDYoggkUE26BiUPDNfbKY5q0qiZBAZKdTiqG19zisJl6
-3lUhLMg8MfhVegodS1hsikfRlwOwahv45P0FCI2VHL9iyJ7L6uY1RrXiGstPExeq
-8ynsqjM0BBrF9OSggPvbbF3iflSaB3kkO2V1FZM66JCuKgSUYN0BsCs77MYF0fDk
-o0pob7c2MTZaP/GTgPG4YBimMd/rsR3WhlMEUsJfbyiADS8Fu4Xg60u1aN7LFI4S
-6RywUkJtBLvyMF3d0BeNRsr+8S3clNioVWXjSMZfR+wFJBGVTJrv4XfftksDF6gL
-TZKgRMOnFZVw6RthNFEW7qoazOcpuyq520+oUQIBiY6Qph/3v5pZeCWy2HlBKU25
-BnaGzV8Guv0FBfyx+W8eXgNloC6UgIR4PLd3SwCGduezN12d2x9Kxdig4p6KqJHH
-MIhUlln/Ffjkqqjw6rD3tZxKKmEpIIp3hnQcUGznqTWtKwiaqbMyYtZyBkeghcmm
-ndBAouVQPpKWskD/wpvKO55LesRaX4UECUvGBTApipLae59ZnmiAv1HtLeEz/Kmx
-Y/wZt2awHT2VfsqMrR3FtAyCNTcd3UNQHeKZAsrsnT+TC5mLiiLjiv9ZZSoZXR7P
-9qJBTj4+CPhFTY3vVDoCOGAOkUs69f88yyytGQdiDsxcRNbFWO4=
-=Qhp9
------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 2ef062f..9cc64d7 100644
--- a/umbrello.changes
+++ b/umbrello.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+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/gear/21.04
+- 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>
+
+- Update to 21.03.90
+  * New feature release
+- No code change since 21.03.80
+
+-------------------------------------------------------------------
+Sun Mar 21 13:30:04 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Too many changes since 20.12.3, only listing bugfixes:
+  * codegenerators: python: Do not create files for classes that has containers (kde#432854)
+  * Fix 'Not all Umbrello global settings are saved to the resource file' (kde#430720)
+  * Address 'It shall be possible to nest folders in packages' : (kde#430593)
+  * Fix for 'Nested folders are not loaded properly' (kde#430323)
+  * Fix for 'Crash on exit with tabbed diagrams enabled' (kde#430322)
+  * umbrello/version.h - Increase XMI_FILE_VERSION to 1.7.0 to reflect major change in XMI attribute order. (kde#363582)
+  * Fix for 'Callback message in sequence diagram cannot be resized' (kde#429794)
+
 -------------------------------------------------------------------
 Thu Mar  4 06:12:07 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/umbrello.spec b/umbrello.spec
index 006841a..bc598d0 100644
--- a/umbrello.spec
+++ b/umbrello.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package umbrello
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without  lang
 Name:           umbrello
-Version:        20.12.3
+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/
+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/stable/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