diff --git a/kapptemplate-20.12.3.tar.xz b/kapptemplate-20.12.3.tar.xz
deleted file mode 100644
index 6bfe2d5..0000000
--- a/kapptemplate-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cf0a5fac4d3a08e616a3d7a0fd066c5c6558ed598b6b4f837e7242835670715
-size 336772
diff --git a/kapptemplate-20.12.3.tar.xz.sig b/kapptemplate-20.12.3.tar.xz.sig
deleted file mode 100644
index d708f82..0000000
--- a/kapptemplate-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEAACgkQu0YzUNbv
-Me+nzA//SpBXkiZve9+C2OMeD0X7w1yKqqZzVc5zPe2o/gy5gZU7BbQGP75EY8sw
-SYl9QjxSytzy/FvYOrPRoa3lbpw0fG4QDUYPn+4dFDiNq4hzKnAQoKMa7Y50fne+
-YoFlIl0PLlCU83F0YjHJrO2ARKXH+8+C+qEeSLWKWHoc+vQCyI8kBsoRCjlVUMkD
-zlE/ULt4t/2EPgbkl0wkeUd2nTnjHJulIzRHdq/ks+iIXQFSDXWmsaBq9cVY09cF
-Mf4gKVbpXJ42S4Hl5S6nl4T2dvgtr/mRdfdBq8HRAB57no9ahgtWM0GAQYbDcRWK
-VQdrHI3JI830JpjrMRXhnmhRizK98XGBsPS1njf7U9mYtQllPyE8Filz6SgqAiDY
-3PPoB2fXZKeINVyaZcWC/uCe3biVV2KwnhV4n8CWbWto+GkLkAYiumJrP049oRzY
-gAiDm+cVLH08HRE1qEyo5QZ6GneHZQif48IHm7BN7/IFVGQ6Y50HXgcpdk40ocdh
-0YORKbrZU0pcA6USV9kiGSxGQU6+ZyMkEGuGV1Ym0zuGIFKdWfBKrAIZjOtZR6Zs
-HvhW6HuipN/yXm6wqXxso8qGay+3i7a8h4TnsY9WvRZf+w0EgmmkJSGLxQqtPP9t
-nNpyKJOMNdUR63AH0RaklSAw76RvDHoi1+KCmkRjxwuj1IhP8ug=
-=kPjN
------END PGP SIGNATURE-----
diff --git a/kapptemplate-21.04.0.tar.xz b/kapptemplate-21.04.0.tar.xz
new file mode 100644
index 0000000..1a1ac3b
--- /dev/null
+++ b/kapptemplate-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3caa31c85cfbf8ecc70bc5121982688b3bb0d71be0ae5df24f69e6a385295e50
+size 333612
diff --git a/kapptemplate-21.04.0.tar.xz.sig b/kapptemplate-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..c28d100
--- /dev/null
+++ b/kapptemplate-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvYACgkQu0YzUNbv
+Me/GzQ/+MpzYRWQcY7zdYlDQZ6heg7TIe0iq98k01v2xj3laaiHkrwuZkndAqj12
+d96y+awiGiDMMeTwC9O7zrD30kVILa5NiRTLuNtcKA8PPBBtZswW9ERZhWrUErNC
+cIE8QeReC/vbm7lDVP8YG0eWVMbdjB0Va6jq8gwcOX/wKx0vfQyCJPrEkE3Td9/3
+mQKkv5cCEkHtpN51W+NlDAsnhrUhzYTeAW1gOurLosUsvkzFhI8c6FNF72A4RA33
+s69Bg7D5gyrXGrMDFpK4BStw5fNjbIa8D4D1002c1jxA2N8p1pq70w5v9MKIgWPV
+E2fJSUpHNs00odq58Y4//m3CZR0eKPPxGpTOIOBbLoBYBIF44kCdBHU91F++tRF0
+RC4EVdlMGwRvo0LNOR+0L2ZAbzY1WQs/0FYUdFal2Wtrat27lLokGEmFy//Y1vc8
+jqdrpjYKUkeS5mU+9wPADOpDS3IAE3xDEhVZ+8h6xe2ri9bhIF4pNYXuf5oRt5TL
+AeoIQyYlC7VWhY81jr76BSz61QZgmnoERzyuY7/X2/4QJd4a1T24v8hWxO0KgrT4
+WAlqliQVHD+YQ3nC9m6KW2DltZJOmbxkilCRl62Zuu42NIgG5QIzFzxd6+eYzoA+
+12Sa/tD7PExKCLzb0Acg5X4dkGxinfNAR+aDDHiBKT/n/Xo/Q6o=
+=Ddby
+-----END PGP SIGNATURE-----
diff --git a/kapptemplate.changes b/kapptemplate.changes
index 2d9bd0c..fb837a9 100644
--- a/kapptemplate.changes
+++ b/kapptemplate.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:26 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:39:53 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:27:33 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- No code change since 20.12.3
+
 -------------------------------------------------------------------
 Thu Mar  4 06:09:52 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/kapptemplate.spec b/kapptemplate.spec
index e3b74c2..82852c8 100644
--- a/kapptemplate.spec
+++ b/kapptemplate.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kapptemplate
 #
-# 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:           kapptemplate
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Template for KDE Application Development
 License:        GPL-2.0-only AND GFDL-1.2-only
 Group:          Development/Tools/IDE
-URL:            https://www.kde.org/
+URL:            https://apps.kde.org/kapptemplate
 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:  kf5-filesystem
 BuildRequires:  update-desktop-files
@@ -43,10 +47,6 @@ BuildRequires:  cmake(Qt5Test)
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
 Obsoletes:      kapptemplate5 < %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 Recommends:     %{name}-lang
 
 %description
@@ -56,7 +56,7 @@ application/part/plugin.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 sed -i 's|Categories=Qt;KDE;Development;|Categories=Qt;KDE;Development;IDE;X-KDE-KDevelopIDE;|g' src/application/org.kde.kapptemplate.desktop
 
 %build
@@ -75,19 +75,19 @@ sed -i 's|Categories=Qt;KDE;Development;|Categories=Qt;KDE;Development;IDE;X-KDE
 %postun -p /sbin/ldconfig
 
 %files
-%license COPYING*
-%dir %{_kf5_appstreamdir}
+%license LICENSES/*
 %doc %lang(en) %{_kf5_htmldir}/en/*/
 %{_kf5_applicationsdir}/org.kde.kapptemplate.desktop
 %{_kf5_appstreamdir}/org.kde.kapptemplate.appdata.xml
 %{_kf5_bindir}/kapptemplate
 %{_kf5_configkcfgdir}/
+%{_kf5_debugdir}/kapptemplate.categories
 %{_kf5_iconsdir}/hicolor/*/apps/kapptemplate.*
 %{_kf5_sharedir}/kdevappwizard/
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%license COPYING*
+%license LICENSES/*
 %endif
 
 %changelog