diff --git a/.mailmap b/.mailmap
index 3ad882153..5f4dd9467 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,4 @@
+31 <31eee384@gmail.com> <331300+31@users.noreply.github.com>
 Andreas Haas <liu.gam3@gmail.com>
 Andrew Conrad <aconrad103@gmail.com>
 Andrii Doroshenko <xrayez@gmail.com>
@@ -6,11 +7,16 @@ Chris Bradfield <chris@kidscancode.org> <cb@scribe.net>
 clayjohn <claynjohn@gmail.com>
 clayjohn <claynjohn@gmail.com> <clayjohn@shaw.ca>
 corrigentia <coryan25@gmail.com> <20541985+corrigentia@users.noreply.github.com>
+DeeJayLSP <djlsplays@gmail.com>
+DeeJayLSP <djlsplays@gmail.com> <60024671+DeeJayLSP@users.noreply.github.com>
 Frido <f.schermutzki@gmail.com>
 Frido <f.schermutzki@gmail.com> <43795127+mega-bit@users.noreply.github.com>
+Hana - Piralein <48352564+Piralein@users.noreply.github.com>
+hpnrep6 <hpnrep6@gmail.com> <57055412+hpnrep6@users.noreply.github.com>
 Hugo Locurcio <hugo.locurcio@hugo.pro> <calinou@opmbx.org>
 Hugo Locurcio <hugo.locurcio@hugo.pro> <hugo.l@openmailbox.org>
 Ignacio Etcheverry <ignalfonsore@gmail.com> <neikeq@users.noreply.github.com>
+jsjtxietian <jsjtxietian@outlook.com>
 Julian Murgia <the.straton@gmail.com>
 Kelly Thomas <kelly.thomas@hotmail.com.au>
 Leon Krause <lk@leonkrause.com>
@@ -19,12 +25,18 @@ Max Hilbrunner <m.hilbrunner@gmail.com>
 Max Hilbrunner <m.hilbrunner@gmail.com> <mhilbrunner@users.noreply.github.com>
 Michael Alexsander <michaelalexsander@protonmail.com>
 Nathan Lovato <nathan@gdquest.com>
+Patrick Exner <patrick.exner1@web.de>
+Patrick Exner <patrick.exner1@web.de> <codejoke@web.de>
 Paul Joannon <hello@pauljoannon.com> <437025+paulloz@users.noreply.github.com>
+Poommetee Ketson <poommetee@protonmail.com>
 Rémi Verschelde <rverschelde@gmail.com> <remi@verschelde.fr>
-skyace65 <trekie96@hotmail.com>
-skyace65 <trekie96@hotmail.com> <trekie96@Hotmail.com>
+skyace65 <matthewehr@hotmail.com>
+skyace65 <matthewehr@hotmail.com> <trekie96@hotmail.com>
+skyace65 <matthewehr@hotmail.com> <trekie96@Hotmail.com>
+TheYellowArchitect <hello@theyellowarchitect.com>
 TwistedTwigleg <beard.noah@gmail.com> <Beard.noah@gmail.com>
 Will Nations <willnationsdev@gmail.com>
-Yuri Roubinsky <chaosus89@gmail.com>
-Yuri Sizov <pycbouh@users.noreply.github.com> <yuris@humnom.net>
+Yuri Rubinsky <chaosus89@gmail.com>
+Yuri Sizov <yuris@humnom.net> <pycbouh@users.noreply.github.com>
+Yuri Sizov <yuris@humnom.net> <11782833+YuriSizov@users.noreply.github.com>
 ZX-WT <ZX-WT@ymail.com> <ZX_WT@ymail.com>
diff --git a/AUTHORS.md b/AUTHORS.md
index 8a87aeb6f..6743ea6a9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -14,23 +14,32 @@ name is available.
 
 (in alphabetical order, with over 10 commits excluding merges)
 
+    31
     Aaron Franke (aaronfranke)
+    Adam Scott (adamscott)
     Andrew Conrad (her001)
     Andrii Doroshenko (Xrayez)
     Arman (puchik)
+    AThousandShips
     Bastiaan Olij (BastiaanOlij)
     bitbutter
+    bruvzg
     Camille Mohr-Daurat (pouleyKetchoupp)
     Chris Bradfield (cbscribe)
     Clay John (clayjohn)
     corrigentia
+    Danil Alexeev (dalexeev)
+    Douglas Leão (DeeJayLSP)
     Fabio Alessandrelli (Faless)
     FeralBytes
+    Fredia Huya-Kouadio (m4gr3d)
     Frido (mega-bit)
     George Marques (vnen)
     Gerrit Großkopf (Grosskopf)
     Griatch
+    Hana - Piralein (Piralein)
     Haoyu Qiu (timothyqiu)
+    hpnrep6
     Hugo Locurcio (Calinou)
     Ignacio Roldán Etcheverry (neikeq)
     Jérôme Gully (Nutriz)
@@ -38,16 +47,24 @@ name is available.
     Julian Murgia (StraToN)
     Kelly Thomas (KellyThomas)
     Leon Krause (leonkrause)
+    Marcel Admiraal (madmiraal)
+    Markus Sauermann (Sauermann)
     Matthew (skyace65)
     Max Hilbrunner (mhilbrunner)
     Michael Alexsander (YeldhamDev)
+    Nathalie Galla (MurderVeggie)
     Nathan Lovato (NathanLovato)
+    Patrick Exner (FlameLizard)
     Paul Joannon (paulloz)
-    Poommetee Ketson (Naryosha)
+    Poommetee Ketson (Noshyaar)
+    Raul Santos (raulsntos)
     Rémi Verschelde (akien-mga)
+    smix8
+    TheYellowArchitect
     Tomasz Chabora (KoBeWi)
     TwistedTwigleg
     Will Nations (willnationsdev)
-    Yuri Roubinsky (Chaosus)
-    Yuri Sizov (pycbouh)
+    Yuri Rubinsky (Chaosus)
+    Yuri Sizov (YuriSizov)
     ZX-WT
+    谢天 (jsjtxietian)