diff --git a/libkeduvocdocument-20.12.3.tar.xz b/libkeduvocdocument-20.12.3.tar.xz
deleted file mode 100644
index a6142a0..0000000
--- a/libkeduvocdocument-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0b5289c727258cf295631b3b2a50880966140e8e1681d7d96731cbe1520bcf4
-size 211096
diff --git a/libkeduvocdocument-20.12.3.tar.xz.sig b/libkeduvocdocument-20.12.3.tar.xz.sig
deleted file mode 100644
index 19e6a36..0000000
--- a/libkeduvocdocument-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEcACgkQu0YzUNbv
-Me+Pgg//fIgTABxE81sbq50X9eqzEKNjlBCGwFSjvRs8z/aUGY5u76Rgki5JlES8
-1tO2E7zdiV+DVvVt61Jf55Vl4+apE1+XoMNG25N7SiEz5d53qe2iZ2RGcolEN2Jo
-WvO7e0xmKCHkSMmiVgzNx2VC9lDHNcU/sxHbSbYAL92Ws1T7JAIMHhXQfigVGWLv
-NrMFZGuj8sHcMnQyo78BIH4pQduy/2nr5v8wCznZa4dASM/JzCQ1pmg9Zlx1EYkp
-13yEzXFaJ0JwpqhnTqRvcGIDw4nyKXk2gGkxNs1G9guFSqqjAbN6lMyqVcfigxow
-EwZCFuaiuaetpJwHoULye79NetFfl/VmhrVisq9tk5VGKGpA3u39Dj2xhCoeNyaq
-8X7+BDMswqOFjyURlBn7OYuJwWEVzSp5gnfNiKNQYwMYBICHzoG8ZUkINQO4YUfA
-JU2vdhbxYZ39Ng56e7thEvDSEc1zP1ihufL+N0hVk2a3/UDB6H73r4NZqEG324fo
-es7GOAFMdp5MHHbafB58OQl279XOD1tzGztfnKkCl3coq6mh7F7KQmA1mmM46aY8
-R46kopfX+5kuSNXYFmt9k0axPf+sx4TlNlK2V5Aj4sP98acX/JmRg8Zq0fozPFxA
-NZxaXyaPP8p3GIuUVB6kgmoJ9YN+XCIUuSwIq/7jLfuRXhG5JcM=
-=6XJ+
------END PGP SIGNATURE-----
diff --git a/libkeduvocdocument-21.04.0.tar.xz b/libkeduvocdocument-21.04.0.tar.xz
new file mode 100644
index 0000000..86fef13
--- /dev/null
+++ b/libkeduvocdocument-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24a40c23b0852fa462700e634a129f7fa355ad47bcea4b026cd211c20388c408
+size 211368
diff --git a/libkeduvocdocument-21.04.0.tar.xz.sig b/libkeduvocdocument-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..ea1445d
--- /dev/null
+++ b/libkeduvocdocument-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwcACgkQu0YzUNbv
+Me8rVw/9HhYFeTNT/jRJJAFSj+hhdaEyy+T/jJzPTEAb++HrNKjMH56jEIMfaB8X
+C2HJIl8yacwHE9RgOHyR/jW6U/p2uGT7dPwKb1TxUSkhNeFVkaG2GejqfmZHO27k
+XYi4BQ2fU/GoAoC6tB569vhEMTe1AMRjakSL0Cii41ChL8Igm/z4J2zNsdWULNVv
+OuKFCloxK4F96z4ZnZAX361YXqaZQv/J3it5cNNmi+cnKtBCpIQtBa326KIFCkrR
+Q8BG7XtXuHVYgOYGvKBgmahjnbpRsHmpjwM6GWn9RZeEcJg/1WJqWaic4cne4wtg
+rHe3HSuqi1WZsfv08kZmQy8EPqKObsGfa3rocyVsZHM1/AZXizRrgbZtNGmXhp3+
+JVWB4aS4qx8+QI7iSFByeleXQNd7QKqu+m8JgCOx2Ll/eWXEUV1sV2Qj2pslh62B
+UZD80Muoky6Zew73Qwh4hksv5QElp6QLJ7xJpIIUzvSUrGUbGSjKIawjep6isVET
+mdtVzy+S6tDfa3SETo1Z3e9q1iS2L2f9HcFZ944z3yNvc1upmJHottOuraMq7i3E
+NPi0Ozx/yHRD6iWCFD+y1MKMAkRQVs70rZoY0R+piXIfTY8my45GLDCkYMA3UsnL
+EK3VIGLWsHRkow6GcH5sBkts0gomPn1Nm9N2JFsxZjyQj6rCKwA=
+=wJV/
+-----END PGP SIGNATURE-----
diff --git a/libkeduvocdocument.changes b/libkeduvocdocument.changes
index 8fb70e3..1bb5aa4 100644
--- a/libkeduvocdocument.changes
+++ b/libkeduvocdocument.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:05 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
+
+-------------------------------------------------------------------
+Fri Apr  9 17:41:31 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:29:31 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Don't include QtTest as it includes all QtCore includes
+
 -------------------------------------------------------------------
 Thu Mar  4 06:11:39 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/libkeduvocdocument.spec b/libkeduvocdocument.spec
index c914916..ca5e99d 100644
--- a/libkeduvocdocument.spec
+++ b/libkeduvocdocument.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libkeduvocdocument
 #
-# 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:           libkeduvocdocument
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Library for KDE Education Applications
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            https://edu.kde.org
 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:  kf5-filesystem
@@ -40,10 +44,6 @@ BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 This package contains the library which is required by the KDE education
@@ -69,12 +69,10 @@ Requires:       libKEduVocDocument5 = %{version}
 This package contains all necessary files and libraries needed to
 develop KDE education applications.
 
-%if %{with lang}
 %lang_package
-%endif
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %cmake_kf5 -d build -- -DKDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR=ON
@@ -85,6 +83,7 @@ develop KDE education applications.
 %if %{with lang}
   %find_lang %{name} --with-man --all-name
 %endif
+
 %fdupes -s %{buildroot}
 
 %post -n libKEduVocDocument5 -p /sbin/ldconfig