diff --git a/ktuberling-20.12.3.tar.xz b/ktuberling-20.12.3.tar.xz
deleted file mode 100644
index 637ab1b..0000000
--- a/ktuberling-20.12.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06a949bf9eb07bdb42732e70c5cc0bdabc4aafedd257d58c5392b60de64c9f34
-size 70712392
diff --git a/ktuberling-20.12.3.tar.xz.sig b/ktuberling-20.12.3.tar.xz.sig
deleted file mode 100644
index cb0b612..0000000
--- a/ktuberling-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBAwF4ACgkQu0YzUNbv
-Me+r/Q//QXCZYXU7y99J2jA12kNeS5JuU/wJb0G2k6461MRZrCCfMSP7iOfx5E4G
-W98Nc+KIj04zpID85raJiznGysWNDnnHoqHAKq/MrQjXu1zRwrOr+1Hc9IumQkte
-pJrCeO9uFJHmAXzgUU2J7L6DZDCnVrNlzItEG+BXjlLGhbEiy7/qbctBfJwEvu4y
-5TJCpIUgGL1DcGKA4RMkHW1fa2Qerm0pXslCRBqZwIKmEOXEMXr2ZoHVT+CQYCQl
-FCB+8e/fMbKBZyq1iRM3zgo/lW19at4XfahXgVHVVZYlbDDxFh0IdI2dqJ9O5bWI
-yF9fTUXn10j/BtKxYQk29CVOqyTQPMqVL1GqDF7rFfem2TefBV4nudRwH0vCW6s0
-e9AVAiCWkcJ8sBN2XUCvb7Cd4qWYk9t4jYUEGoaC8uWzOaMwX5a8oFVe/q+3w951
-0XOmQ4qlLneHu1oAFpF8jCatgytuEUKIJTa0u5PppTpbfwsURQK9xrvENaBoxPC5
-sdz0FDVGYIhBuY1lchYvu+JtTosESP68MatoNmVZTzgKqhS1odot5Ez9Y9sq2Jja
-/5Jxh/AZBhUwz3cEyPqzWi6lHPtgqh3QSbiwZjqJhsmIYy36cD5iVMGcqIRqLwPx
-n+Zu2avC/K3rSxFWYCVVArzKO8Rmk2Vvv633n1xfwU2/Rz5RruY=
-=0T2B
------END PGP SIGNATURE-----
diff --git a/ktuberling-21.04.0.tar.xz b/ktuberling-21.04.0.tar.xz
new file mode 100644
index 0000000..ce1b7f4
--- /dev/null
+++ b/ktuberling-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:518c00bbf363153b4948662c1299e0c24ce5258bbfc410efc383920adf1dcf93
+size 70758508
diff --git a/ktuberling-21.04.0.tar.xz.sig b/ktuberling-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..e601c47
--- /dev/null
+++ b/ktuberling-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwYACgkQu0YzUNbv
+Me/RuhAAly8JNmeeax/X9ZftKJexnK5xsn+62lRjDGQ5340lXPGH49GYOb6jdO40
+BSd7VaVmj0MQ4H7r4gVjLisj1kT0QwzQ4qXWNbFkFODQldTQasd1EkN+9yYOH5V5
+gcwovS0x7pqAkvP81HLrHE5Slaxa18BDORc7NsfXYPzhpXTkeRF8Cp1KmK6pcz5H
+gc4M4ebMwAdt9KtzYwxUThyKebWVCt+vYhCQr3SACh7sdZLDKumawd7XBASPNqnm
+RXnHje/bAe/I34YMYig3PUR9W8oDJaXuPYESjN+gMoMPOPERaP7bIqA4623y5TZ/
+C1qiK2F5s/kdIxp+ebg87LJOlzscwnq+mZ10l6qN2VOMzh0OdsKGSXoVovaojZZL
+y44MNd9+D1L5OvFPzyGym2UChIRz+u8n2VfjHoYEPitvknU2egAmIRE8QNtXO+pk
+c4sX8BgNTb/OmlC62sGza9EyxrPVhN/1mDYSaTstJ+NBsyGKLdjrO4kderbKNdVI
+1fHTL2nymcAhh7ihGaoZhL/Mh9eT1HH/3h1j5MEKCE1hlIn1K1dlVcoatb9Pbmqk
+c+N32k+aMO9PGGcmq8kcjmiIdPSyqSMGBRqS6IkypUx78Qo0vCLAmhDgdaz4DveY
+TxnPQP3kHlcnajbV+LbHIYCP5Dl9RFACak3nS25rgn0Ygm4/x1M=
+=vI7E
+-----END PGP SIGNATURE-----
diff --git a/ktuberling.changes b/ktuberling.changes
index 0c7e22c..cc795c8 100644
--- a/ktuberling.changes
+++ b/ktuberling.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:12:56 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:22 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:21 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Changes since 20.12.3:
+  * Remove dead cmake code
+  * Autogenerate categories file
+  * Fix filename on saving on Windows. path() does not return a valid path. (kde#207162)
+
 -------------------------------------------------------------------
 Thu Mar  4 06:11:30 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
diff --git a/ktuberling.spec b/ktuberling.spec
index 896c66c..25e19a6 100644
--- a/ktuberling.spec
+++ b/ktuberling.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ktuberling
 #
-# 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:           ktuberling
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        Potato drawing editor
 License:        GPL-2.0-or-later
 Group:          Amusements/Toys/Other
-URL:            https://www.kde.org
+URL:            https://apps.kde.org/ktuberling
 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:  update-desktop-files
 BuildRequires:  cmake(KF5Completion)
@@ -50,10 +54,6 @@ BuildRequires:  cmake(Qt5Xml)
 Recommends:     %{name}-lang
 Provides:       ktuberling5 = %{version}
 Obsoletes:      ktuberling5 < %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 KTuberling is a nice potato editor for kids. The game intended for
@@ -64,7 +64,7 @@ face and goodies can be attached onto a potato-like guy.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -83,11 +83,11 @@ face and goodies can be attached onto a potato-like guy.
 %doc %lang(en) %{_kf5_htmldir}/en/ktuberling/
 %{_kf5_applicationsdir}/org.kde.ktuberling.desktop
 %{_kf5_appsdir}/ktuberling/
+%{_kf5_appstreamdir}/org.kde.ktuberling.appdata.xml
 %{_kf5_bindir}/ktuberling
 %{_kf5_debugdir}/ktuberling.categories
-%{_kf5_iconsdir}/hicolor/*/*/*
+%{_kf5_iconsdir}/hicolor/*/*/*tuberling.png
 %{_kf5_kxmlguidir}/ktuberling/
-%{_kf5_appstreamdir}/org.kde.ktuberling.appdata.xml
 
 %if %{with lang}
 %files lang -f %{name}.lang