diff --git a/.rev b/.rev
index ea56a85..3349e13 100644
--- a/.rev
+++ b/.rev
@@ -431,4 +431,23 @@
     <comment>KDE Applications 20.12.1</comment>
     <requestid>861099</requestid>
   </revision>
+<<<<<<< Updated upstream
+=======
+  <revision rev="55" vrev="1">
+    <srcmd5>4fdd6bcd7bca101ee7639860e07cd23b</srcmd5>
+    <version>20.12.2</version>
+    <time>1612707272</time>
+    <user>dimstar_suse</user>
+    <comment>20.12.2 release</comment>
+    <requestid>869241</requestid>
+  </revision>
+  <revision rev="56" vrev="1">
+    <srcmd5>4402b67aba81d54c8e0667ebad58a6c7</srcmd5>
+    <version>20.12.3</version>
+    <time>1615212648</time>
+    <user>dimstar_suse</user>
+    <comment>20.12.3 release</comment>
+    <requestid>877012</requestid>
+  </revision>
+>>>>>>> Stashed changes
 </revisionlist>
diff --git a/akonadi-notes-20.12.3.tar.xz b/akonadi-notes-20.12.3.tar.xz
new file mode 120000
index 0000000..63a343a
--- /dev/null
+++ b/akonadi-notes-20.12.3.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreiehivnezk4uvdnoaihdu3wpd2jeiqgy34mebppgznu2arxfzlhfxi
\ No newline at end of file
diff --git a/akonadi-notes-20.12.3.tar.xz.sig b/akonadi-notes-20.12.3.tar.xz.sig
new file mode 100644
index 0000000..640f092
--- /dev/null
+++ b/akonadi-notes-20.12.3.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kD4ACgkQu0YzUNbv
+Me+6Lg//acGdYv53djgGIjCqtsxiC/5NrbBhmcs5fMveuwXbB4uTUiyuRmz7Op8W
+H9rGBzz3WPMkCvVJ9O3+zNy2juQFcDtF/8AiUA1wlGlI+BMwMJoubxYZ4iMKYq9v
+i9Pbf8ipqOSuLzYRIO9X6PkiTNUZOq9bzsMeq4yUtACumteVYGWVG+EM8SyXpgLl
+4LCwhBgyDP7wxaZKHUqV9Kx7MYPOsfSSHwFMCKnzac5FdzsZ2yZ/0PzIWr0t9rO9
+tvcLMbcfm56kPj/bEqy5b/XtM8NzM92ZlE4qBE9wATvghpdQFT9v3gAtKmmAq5zL
+kIZORgaYabegnbNOWH7w2uXYjCmcRKqUOR8GL+LEVYVj9b/JODiM1/tK0c1nTdGp
+Fa7g+6tTixP2xk0UlFItH5kelNDueajT8SZ3KAhSjpidHxU3uNsBf8ZPzTHzgX4g
+4vRW6r49PV9RziSl4QQJ3qqwU51DcJkFPQxgzUPBEcMCV7lxdqpV6UQBfdUTpNpA
+I4ejG3KlYiBthDkC6sRjkpJocEh7dzi3tmY1/dL+Y8QFRAzu0X4vohD7tziaK5YJ
+FOEAmUGP8nFI54NttPq3CNbcIDxpCo8ggXRt8M5m46T6JPCoEDnYR4phM4gx75Z1
+Y2LlM83ORZcQu/YTBSaKmQZV2KpHIdPaMpSNtyEEwUvx0LNsNQI=
+=boK3
+-----END PGP SIGNATURE-----
diff --git a/akonadi-notes.changes b/akonadi-notes.changes
index 9282a89..e2ba92f 100644
--- a/akonadi-notes.changes
+++ b/akonadi-notes.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+<<<<<<< Updated upstream
+=======
+Thu Mar  4 06:09:20 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
+
+- Update to 20.12.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/releases/20.12.3
+- No code change since 20.12.2
+
+-------------------------------------------------------------------
+Wed Feb  3 08:27:39 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 20.12.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/releases/2021-02-apps-update
+- No code change since 20.12.1
+
+-------------------------------------------------------------------
+>>>>>>> Stashed changes
 Tue Jan  5 12:24:31 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.1
diff --git a/akonadi-notes.spec b/akonadi-notes.spec
index fe338d7..b242e8a 100644
--- a/akonadi-notes.spec
+++ b/akonadi-notes.spec
@@ -21,7 +21,11 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-notes
+<<<<<<< Updated upstream
 Version:        20.12.1
+=======
+Version:        20.12.3
+>>>>>>> Stashed changes
 Release:        0
 Summary:        Library to implement management of notes in Akonadi
 License:        LGPL-2.1-or-later
diff --git a/applications.keyring b/applications.keyring
index d2b6a35..864f48e 100644
Binary files a/applications.keyring and b/applications.keyring differ