diff --git a/.rev b/.rev
index 34c1018..a91ba2f 100644
--- a/.rev
+++ b/.rev
@@ -431,4 +431,23 @@
     <comment>KDE Applications 20.12.1</comment>
     <requestid>861098</requestid>
   </revision>
+<<<<<<< Updated upstream
+=======
+  <revision rev="55" vrev="1">
+    <srcmd5>bb617ed02518754a439f68b0640c28d0</srcmd5>
+    <version>20.12.2</version>
+    <time>1612707270</time>
+    <user>dimstar_suse</user>
+    <comment>20.12.2 release</comment>
+    <requestid>869240</requestid>
+  </revision>
+  <revision rev="56" vrev="1">
+    <srcmd5>d023b73452f7d80cc16cdcf4b88a6608</srcmd5>
+    <version>20.12.3</version>
+    <time>1615212644</time>
+    <user>dimstar_suse</user>
+    <comment>20.12.3 release</comment>
+    <requestid>877011</requestid>
+  </revision>
+>>>>>>> Stashed changes
 </revisionlist>
diff --git a/akonadi-mime-20.12.3.tar.xz b/akonadi-mime-20.12.3.tar.xz
new file mode 120000
index 0000000..e734df9
--- /dev/null
+++ b/akonadi-mime-20.12.3.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreihulwl537wvslnys7fx3uhfagb524vq6k63oyiwrel32s3ttv65wy
\ No newline at end of file
diff --git a/akonadi-mime-20.12.3.tar.xz.sig b/akonadi-mime-20.12.3.tar.xz.sig
new file mode 100644
index 0000000..7cfaf19
--- /dev/null
+++ b/akonadi-mime-20.12.3.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kD4ACgkQu0YzUNbv
+Me8Jwg/9Hs1QEbkMJm3rsyIgfE0mi8ShjgrBHT+7YvVrlWM9ZG3vz3UYil0ZF5Xc
+ynAbIrbNgdk1JZOmEVI4S6eR5MYcJtqtpqwYxGcxQHGuoSVZpqTlWPF/yqQVObzo
+UZgCqLsg0tTduGgiK2wTMG5R79O/uJ9ADgpOEq6SS5AkBcta4XogzeaJeAkbyNCD
+ABLIHcuAfUuSLJb7WSiHwf0VaGR93e1Yl5kex1ex8RB2j2kx7fw4g5DFoVWzcuQD
+g5uD4TQv7eqZTYsLIlpKl8qROE0mFiRurclZrpNmBz4OOgglzHxmRCvEy/eXXDSm
+qjwmi6X+uJx55B6jZ58r+P4gk/b5W+N9WIugxkEcnR4XwczMB45aXyvrC8gQIjBM
+Dl9eLGXJiXHk04okxdWkCIa6ri6RH++8oiziY8GBC1m9B1ocmjXaFZgzgphn6S9g
+1ESLiDhPqLowB0bWUcJrgzP2lfAVJXMKXTpREgy7M2YNhYraoc2ZnpmNsIZhtU2V
+T47VDCmEBbxpNifaZsSo10AyX49EubsuTP7A2FG8Nr7GLz1qA1xzPpbvmcLorMrf
+/T4FtB+uQW40pK4nDdfbx8I6+YMCrHCjTcS6Wk+YDIyawyhOzo2yEa9SY1D9zKu4
+T565HeIWhq5+40uyoVGALaPFdlxMGU6RrbiLEn56b4LR7lTqfa8=
+=k4Ke
+-----END PGP SIGNATURE-----
diff --git a/akonadi-mime.changes b/akonadi-mime.changes
index 2a7cb83..c12154f 100644
--- a/akonadi-mime.changes
+++ b/akonadi-mime.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+<<<<<<< Updated upstream
+=======
+Thu Mar  4 06:09:19 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:30 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.1
diff --git a/akonadi-mime.spec b/akonadi-mime.spec
index dcd69fa..77fc142 100644
--- a/akonadi-mime.spec
+++ b/akonadi-mime.spec
@@ -22,7 +22,11 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-mime
+<<<<<<< Updated upstream
 Version:        20.12.1
+=======
+Version:        20.12.3
+>>>>>>> Stashed changes
 Release:        0
 Summary:        MIME email parser for KDE PIM
 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