diff --git a/akonadi-contact.changes b/akonadi-contact.changes
index 68e269d..eae72e2 100644
--- a/akonadi-contact.changes
+++ b/akonadi-contact.changes
@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Fri Aug  6 09:33:32 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.08.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.08.0
+- Changes since 21.07.90:
+  * Drop X-KDE-Keywords entries from kcm desktop files
+
+-------------------------------------------------------------------
+Fri Jul 30 10:04:16 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.07.90
+  * New feature release
+- No code change since 21.07.80
+
+-------------------------------------------------------------------
+Sat Jul 17 20:04:44 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.07.80
+  * New feature release
+- Changes since 21.04.3:
+  * Make sure that we don't cancel dialog
+  * Port away from KStatefulBrush::brush(const QWidget*)
+  * Add CMake check for KCMUtils without which akonadi-contacts fails to compile
+  * It's already find in top level
+  * Use K_PLUGIN_CLASS_WITH_JSON install in pim/kcm/kaddressbook too
+  * Remove ServiceTypes
+  * Fix some clazy warning
+  * Modernize code
+  * Remove unused includes
+  * Fix mem leak found by asan
+  * Replace std::binary_function usage with a lambda
+  * Fix for MSVC compile
+  * Add missing parent
+- Only install the license files once
+
 -------------------------------------------------------------------
 Wed Jul  7 08:56:35 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/akonadi-contact.spec b/akonadi-contact.spec
index 723bb78..21c6d8f 100644
--- a/akonadi-contact.spec
+++ b/akonadi-contact.spec
@@ -23,7 +23,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-contact
-Version:        21.04.3
+Version:        21.08.0
 Release:        0
 Summary:        KDE PIM Libraries for Akonadi Contacts
 License:        LGPL-2.1-or-later
@@ -46,6 +46,8 @@ BuildRequires:  cmake(KF5DBusAddons) >= %{kf5_version}
 BuildRequires:  cmake(KF5GrantleeTheme)
 BuildRequires:  cmake(KF5I18n) >= %{kf5_version}
 BuildRequires:  cmake(KF5IconThemes) >= %{kf5_version}
+# Needed by kdesktopjson
+BuildRequires:  cmake(KF5KCMUtils) >= %{kf5_version}
 BuildRequires:  cmake(KF5KIO) >= %{kf5_version}
 BuildRequires:  cmake(KF5Libkleo)
 BuildRequires:  cmake(KF5Mime)
@@ -58,7 +60,6 @@ BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
 Requires:       libKF5AkonadiContact5 = %{version}
 Requires:       libKF5ContactEditor5 = %{version}
-Recommends:     %{name}-lang
 Provides:       akonadi-contacts = %{version}
 Obsoletes:      akonadi-contacts < %{version}
 
@@ -141,19 +142,19 @@ to develop KDE PIM applications.
 %{_kf5_debugdir}/*.categories
 %{_kf5_debugdir}/*.renamecategories
 %{_kf5_plugindir}/akonadi/contacts/plugins/
-%{_kf5_plugindir}/kcm_akonadicontact_actions.so
+%dir %{_kf5_plugindir}/pim/
+%dir %{_kf5_plugindir}/pim/kcms/
+%dir %{_kf5_plugindir}/pim/kcms/kaddressbook
+%{_kf5_plugindir}/pim/kcms/kaddressbook/kcm_akonadicontact_actions.so
 %{_kf5_servicesdir}/akonadicontact_actions.desktop
 
 %files -n libKF5AkonadiContact5
-%license LICENSES/*
 %{_kf5_libdir}/libKF5AkonadiContact.so.*
 
 %files -n libKF5ContactEditor5
-%license LICENSES/*
 %{_kf5_libdir}/libKF5ContactEditor.so.*
 
 %files -n akonadi-plugin-contacts
-%license LICENSES/*
 %{_kf5_plugindir}/akonadi_serializer_addressee.so
 %{_kf5_plugindir}/akonadi_serializer_contactgroup.so
 %dir %{_kf5_sharedir}/akonadi
@@ -163,7 +164,6 @@ to develop KDE PIM applications.
 %{_kf5_sharedir}/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 
 %files devel
-%license LICENSES/*
 %dir %{_kf5_includedir}/Akonadi
 %dir %{_kf5_includedir}/ContactEditor
 %dir %{_kf5_includedir}/akonadi
@@ -181,7 +181,6 @@ to develop KDE PIM applications.
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%license LICENSES/*
 %endif
 
 %changelog
diff --git a/akonadi-contacts-21.04.3.tar.xz b/akonadi-contacts-21.04.3.tar.xz
deleted file mode 100644
index 4c1ce2d..0000000
--- a/akonadi-contacts-21.04.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
-size 424004
diff --git a/akonadi-contacts-21.04.3.tar.xz.sig b/akonadi-contacts-21.04.3.tar.xz.sig
deleted file mode 100644
index a8ab8f7..0000000
--- a/akonadi-contacts-21.04.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmDj6aoACgkQu0YzUNbv
-Me+eyg//a+KZqJVbCNmShNT6aEFxhxkmIjg3uMynWZHxswlYhm+6W7X8WK6ACVLl
-nBwg5MregbY0R248e8oqyIlKpiOVVrafILGPF+R7NYEQOycuzHR64st5++0LiJI8
-E/Yno0I/b+xzkjGd+LgrYXqA+Fo+hVJ0xFCVHMwJnLbfOc/6pqrO3Fs5I3zbxpcr
-rEgBm/ckipZaLyS8sW7tYVFpaNiyJCIeocuEkMiYeyTQ2jRgrucP0bZxHeHe8hpv
-ws0TpAdiVOZy+f5KQkcholEdrP6eo0D4iYNHUnoSgwuaFdhjAq7mC65vDRBBys6l
-3BTDe25IIpDx1F3/rsW9L0I6tfTyIGgIUJKgJ4G+MpWFoVg9BYbgnQ74lmOgPRz+
-xjK2hu9dgxFH1ufeZGak8b4wRhG6oRnXcqJeBBCe0SekWSxfDe8XQjo+vlusOhaE
-6oA6+o7/+VXG5JTpvRH5g24pY+Sh89n/FdAlv7TBRFU1ijuV6fqhQs5PPv7s8bCU
-L++Q8rij4KaF0qjXI5ldmJj5hZxGjCzHnVWNybEGwKZdmnlh6/HI4O+uX7qxSEag
-qzXDhCq3lHXb9dlT+vvhiQj/sPxRjXyYpquhHMX3lgHTj8Hpa5RmUW/pU50wb0hJ
-Ua890HXX1jsKnDNRipRw8Rj+m1WW4baPj0qz6lbn74LjMCHV1ME=
-=TwKh
------END PGP SIGNATURE-----
diff --git a/akonadi-contacts-21.08.0.tar.xz b/akonadi-contacts-21.08.0.tar.xz
new file mode 100644
index 0000000..174042f
--- /dev/null
+++ b/akonadi-contacts-21.08.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01fba5223b1d495266041f2ac4ade990b8a661ae9bd1af084768e75c9676c02b
+size 420876
diff --git a/akonadi-contacts-21.08.0.tar.xz.sig b/akonadi-contacts-21.08.0.tar.xz.sig
new file mode 100644
index 0000000..d192298
--- /dev/null
+++ b/akonadi-contacts-21.08.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmEMgN4ACgkQu0YzUNbv
+Me8JBg/+Ij3H5OaDhhvQZKWMch85QKkFmVRUUKfTad0PwgdKgZ7IOkvEl0G7Z6Km
+cvshkEqJs+U/QiqehGgPAuZxmi9oSARQV6DjjdhDDDAJHl9P6m0JWdQa2Y8pmLuq
+XYkT2ibZv35qVjpXoyAzc1z7E0oJulk22AE6frQbsHH1s0YyfFjOqp+M19WTI3rt
+l6O608JaLiyvD68X35bV13YxKAxduVKyCoJGJ+qJFhceXCZAT3DPgK5b0nyQ6coY
+tvIxuAJjFIKwAVojtDu0xo0ex+lGL5GlCE+il1IvwDGVwvdco9AuAAw5g0KJN8Sh
+udD5naa8ewbiunfJPbpjEZd7ggHmugE7wMvkrJVun7u5In9e3YCiH/QTW+o8E0/t
+12GLfmBUsiLJXaab1Kf2kkfH8kcHrcC4KICdi3TUnsZjZ0gyTgLh+ZZUYqbMABR7
+WB8iZGi527EmUFdYXlOvQbzfzAlFAUN/znuVjVutSsYou0Wk4v9P5PrC3Go1tJTU
+zbyNFVlc+O3b9PbXGFl4k6uzra2YO1hEOXzyLsmSMmXlBX+TGCDk+9Yx+yQANpuj
+RTPMA3cPbj+bdydf9cbD2GfTfHrSKcLghKTo42g+Dy3ZmjK9et3q69AvSmVTW5VU
+1bSjTpXW24uhN6svae64zPmBkx/m2zoKKQevX4oyfqsZAwLDwJc=
+=83/0
+-----END PGP SIGNATURE-----