diff --git a/.mailmap b/.mailmap
index c54fa4dd79..07011d724c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,12 +24,17 @@ Clay John <claynjohn@gmail.com>
 Clay John <claynjohn@gmail.com> <clayjohn@shaw.ca>
 Dana Olson <dana@shineuponthee.com> <adolson@gmail.com>
 Daniel J. Ramirez <djrmuv@gmail.com>
+Erik Selecký <35656626+rxlecky@users.noreply.github.com>
+Erik Selecký <35656626+rxlecky@users.noreply.github.com> <35656626+SeleckyErik@users.noreply.github.com>
 Fabian <supagu@gmail.com>
 Ferenc Arn <tagcup@yahoo.com>
 Ferenc Arn <tagcup@yahoo.com> <tagcup@users.noreply.github.com>
+Fredia Huya-Kouadio <fhuyakou@gmail.com>
+Fredia Huya-Kouadio <fhuyakou@gmail.com> <fhuya@google.com>
 Geequlim <geequlim@gmail.com>
 Gilles Roudiere <gilles.roudiere@gmail.com>
 Gilles Roudiere <gilles.roudiere@gmail.com> <gilles.roudiere@laas.fr>
+Gordon MacPherson <gordon@gordonite.tech>
 Guilherme Felipe <guilhermefelipecgs@gmail.com>
 Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>
 Hein-Pieter van Braam-Stewart <hp@tmm.cx>
@@ -41,6 +46,8 @@ Hugo Locurcio <hugo.locurcio@hugo.pro> Calinou <calinou@opmbx.org>
 Ian Bishop <ianb96@gmail.com>
 Ignacio Etcheverry <ignalfonsore@gmail.com>
 Ignacio Etcheverry <ignalfonsore@gmail.com> <neikeq@users.noreply.github.com>
+Ilaria Cislaghi <cislaghi.ilaria@gmail.com>
+Ilaria Cislaghi <cislaghi.ilaria@gmail.com> <ilaria.cislaghi@simedis.com>
 Indah Sylvia <ISylvox@yahoo.com>
 J08nY <johny@neuromancer.sk> <jancar.jj@gmail.com>
 J08nY <johny@neuromancer.sk> <J08nY@users.noreply.github.com>
@@ -58,6 +65,7 @@ Kelly Thomas <kelly.thomas@hotmail.com.au>
 K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
 Leon Krause <lk@leonkrause.com> <eska@eska.me>
 Leon Krause <lk@leonkrause.com> <eska014@users.noreply.github.com>
+Manuel Strey <manuel.strey@gmx.de>
 Marcelo Fernandez <marcelofg55@gmail.com>
 Marcin Zawiejski <dragmz@gmail.com>
 Mariano Javier Suligoy <marianognu.easyrpg@gmail.com>
@@ -66,7 +74,7 @@ marxin <mliska@suse.cz>
 marynate <mary.w.nate@gmail.com> <marynate@github.com>
 Max Hilbrunner <m.hilbrunner@gmail.com>
 Max Hilbrunner <m.hilbrunner@gmail.com> <mhilbrunner@users.noreply.github.com>
-Michael Alexsander Silva Dias <michaelalexsander@protonmail.com>
+Michael Alexsander <michaelalexsander@protonmail.com>
 Nathan Lovato <nathan@gdquest.com>
 Nathan Warden <nathan@nathanwarden.com> <nathanwardenlee@icloud.com>
 Nils ANDRÉ-CHANG <nils@nilsand.re>
diff --git a/AUTHORS.md b/AUTHORS.md
index c5981306c4..e9d095aae3 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -62,15 +62,18 @@ name is available.
     Emmanuel Barroga (codecustard)
     Emmanuel Leblond (touilleMan)
     Eric Lasota (elasota)
+    Erik Selecký (rxlecky)
     est31
     Fabian Mathews (supagu)
     Fabio Alessandrelli (Faless)
     Ferenc Arn (tagcup)
     Franklin Sobrinho (TheHX)
+    Fredia Huya-Kouadio (m4gr3d)
     Geequlim
     George Marques (vnen)
     Gerrit Großkopf (Grosskopf)
     Gilles Roudiere (groud)
+    Gordon MacPherson (RevoluPowered)
     Guilherme Felipe de C. G. da Silva (guilhermefelipecgs)
     Hanif Bin Ariffin (hbina)
     Hein-Pieter van Braam-Stewart (hpvb)
@@ -81,6 +84,7 @@ name is available.
     Ian Bishop (ianb96)
     Ibrahn Sahir (ibrahn)
     Ignacio Etcheverry (neikeq)
+    Ilaria Cislaghi (QbieShay)
     Indah Sylvia (ISylvox)
     J08nY
     Jakub Grzesik (kubecz3k)
@@ -110,7 +114,7 @@ name is available.
     Matthias Hölzl (hoelzl)
     Max Hilbrunner (mhilbrunner)
     merumelu
-    Michael Alexsander Silva Dias (YeldhamDev)
+    Michael Alexsander (YeldhamDev)
     MichiRecRoom (LikeLakers2)
     mrezai
     Nathan Warden (NathanWarden)
@@ -142,12 +146,13 @@ name is available.
     santouits
     SaracenOne
     sersoong
+    Shiqing (kawa-yoiko)
     Simon Wenner (swenner)
     Swarnim Arun (minraws)
     Theo Hallenius (TheoXD)
     Thomas Herzog (karroffel)
-    Timo (toger5)
     Timo Schwarzer (timoschwarzer)
+    Timo (toger5)
     Tomasz Chabora (KoBeWi)
     Twarit Waikar (IronicallySerious)
     Vinzenz Feenstra (vinzenz)