diff --git a/.files b/.files
index 59d78db..48b378f 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 62d1769..d8ff855 100644
--- a/.rev
+++ b/.rev
@@ -543,4 +543,12 @@
     <comment>KDE Gear 21.12.3</comment>
     <requestid>958764</requestid>
   </revision>
+  <revision rev="69" vrev="1">
+    <srcmd5>015941ec3e11214170cee16f2266a3fd</srcmd5>
+    <version>22.04.0</version>
+    <time>1650752339</time>
+    <user>dimstar_suse</user>
+    <comment>KDE release gear 22.04.0</comment>
+    <requestid>971382</requestid>
+  </revision>
 </revisionlist>
diff --git a/akonadi-notes-21.12.3.tar.xz b/akonadi-notes-21.12.3.tar.xz
deleted file mode 120000
index 8f4e2f9..0000000
--- a/akonadi-notes-21.12.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreiclu6cbr334qzv3adnxtedj57guixzsgj2rxqmbs7o76x3whytmoy
\ No newline at end of file
diff --git a/akonadi-notes-21.12.3.tar.xz.sig b/akonadi-notes-21.12.3.tar.xz.sig
deleted file mode 100644
index e4bf15e..0000000
--- a/akonadi-notes-21.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmIdZeAACgkQu0YzUNbv
-Me9rJw/+JMwbIR2p4c9Ukoabwf9Oc6zN1Tvo4WhzfiJY6ABmM+dQanE8u1aw6WHf
-0trEX3sNj3yimMYsoyG7IPZERVEzQwvOJ2njQYbLCJWL4nSifP19T2JHZ4j5uHKD
-xn40QKDFGQOrQjEQ7JWNZOjeFhBqZLtMHns+VCliubdN+UhlVPcDKHlerrRnN7Li
-ueSxZ1f7mVHr7zCv3pk6mycty/vOFBAbbDt0YcOPktRgwYQ4hC3J8jdIpYf0DiMz
-NzzqluJByKUlGwNBRwxmYusuyZ0uF73p37LBksWeiNq02NpiCVCCdZD+HIFM5Sm0
-poRWM3TE50RDf1lIXywlBhDlnSID4hWbM94ARdY2x+11skraFv7OFksdfKMaoqza
-n1BKHvUpy5UGdowjktyOz127xMIKYay3DeTczQPCiB047o7bs2Mc1uj3vh2qdEKY
-WYJnuUVvuMFqTMShsnuBDj1PHkcWOw5NGnXVtwNTTjPzPtLhAMvOoSG6+D6iWkQ0
-fXDGVzqGO6mf+KUroSPAxOMn3CDEYxZWb5wbb4s0xJvppCTXEvhVKcWhM9fy7XD6
-Bpg8fJJf4w0+3TMDjtRepXqBn3vJ1x9AEe68WpdoSRKWYlicvdjZR/McMXFnTz1n
-tJ5gW7KHkHfK6IHRhHS4xmKfSue0YXb9RVnFw4WDyPizzE1L6Oo=
-=C+Fr
------END PGP SIGNATURE-----
diff --git a/akonadi-notes-22.04.0.tar.xz b/akonadi-notes-22.04.0.tar.xz
new file mode 120000
index 0000000..ba59c97
--- /dev/null
+++ b/akonadi-notes-22.04.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreicbjx2kgofuwposflfjpsiaqllnkmm6w55ni7umkong3cbewpinoa
\ No newline at end of file
diff --git a/akonadi-notes-22.04.0.tar.xz.sig b/akonadi-notes-22.04.0.tar.xz.sig
new file mode 100644
index 0000000..b642b56
--- /dev/null
+++ b/akonadi-notes-22.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmJYuncACgkQu0YzUNbv
+Me/U0Q/+LG9D1mVmb+FpuX9dtu3XmwnfiKsYIGJuUSkWksz2t7hXgckPfUexTyTL
+mxdNgk4lCi5EvhEXrkEW9j6MpLKI9/6A2dUR/mnMhF32RgtQsigf+hUrqS9+RnVQ
+Nl4Tio4nUIoEc8APeOmzPPIKSE9gVjK0xu+isXca9PM6TpAgVBD6xyh+fR54xPW5
+aI0I7s/V8MaNaeXHFVmApmyZ+5IH5I7P62i+PQIwvKwobXbk7nU/aeGgSOhCd0kY
+KDFPai6txTM38sDAkUy1dmh/zbMBC8PkkstbvUoSCei5/U8Pe2pIgFjtXLcJfNzD
+eOGrpy8taM+xUCHwFDoiq1JspqLoHKWvzxShwpPzTMte1JfRqOqCEh0fQQjEWQXz
++CdwFSeerzC84+gV33Gvi2bJmgSdfmqOP4puzw4vNCKYlU4dNNfm9KH2gjvKxcI4
+oPiqeW3/jQeueIIJ9FS5T6sTH+d4B9UpD7eJemT1Wx+UjeTnq2sh8w18iekWh2Wz
+fnehwts07J7b7U050F1T2U77zhsX6s5lnAM0WrT3jpjO76V396HiCj/Lj5ogT/ko
+sZ98oBgI3v7OZ9MTUFA/vnf4xvbLdQXWDWr0ArwvUilQyVEo5h1u91C2ETmn1CpL
+yuLbObUwEI9DIzKF+DHlIQUzm2pC71HE0hJ+N/kL1ehWjkaJ6vc=
+=D25w
+-----END PGP SIGNATURE-----
diff --git a/akonadi-notes.changes b/akonadi-notes.changes
index 9099011..b5c7249 100644
--- a/akonadi-notes.changes
+++ b/akonadi-notes.changes
@@ -1,4 +1,29 @@
 -------------------------------------------------------------------
+Mon Apr 18 07:50:37 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 22.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/22.04.0/
+
+-------------------------------------------------------------------
+Fri Apr  8 18:16:53 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 22.03.90
+  * New feature release
+
+-------------------------------------------------------------------
+Wed Mar 23 08:13:28 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 22.03.80
+  * New feature release
+- Changes since 21.12.3:
+  * Fix compile without deprecated method
+  * normalize install header include (fix qt6 build)
+  * Adapt build system for building against qt6
+  * Correct prefix to other PIM repositories in .kde-ci.yml
+
+-------------------------------------------------------------------
 Tue Mar  1 09:56:31 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
 
 - Update to 21.12.3
diff --git a/akonadi-notes.spec b/akonadi-notes.spec
index 70a8585..406c6ef 100644
--- a/akonadi-notes.spec
+++ b/akonadi-notes.spec
@@ -21,7 +21,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without released
 Name:           akonadi-notes
-Version:        21.12.3
+Version:        22.04.0
 Release:        0
 Summary:        Library to implement management of notes in Akonadi
 License:        LGPL-2.1-or-later
@@ -91,12 +91,8 @@ library in other applications.
 %{_kf5_libdir}/libKF5AkonadiNotes.so.*
 
 %files devel
-%dir %{_kf5_includedir}/Akonadi
-%dir %{_kf5_includedir}/akonadi
 %{_kf5_cmakedir}/KF5AkonadiNotes/
-%{_kf5_includedir}/Akonadi/Notes/
-%{_kf5_includedir}/akonadi-notes_version.h
-%{_kf5_includedir}/akonadi/notes/
+%{_kf5_includedir}/AkonadiNotes/
 %{_kf5_libdir}/libKF5AkonadiNotes.so
 %{_kf5_mkspecsdir}/qt_AkonadiNotes.pri