diff --git a/.mailmap b/.mailmap
index 91cacb71d2..07dcb1f421 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@ David Rubin <daviru007@icloud.com> <87927264+Rexicon226@users.noreply.github.com
 Dominic <4678790+dweiller@users.noreply.github.com>
 Dominic <4678790+dweiller@users.noreply.github.com> <4678790+dweiller@users.noreplay.github.com>
 Eric Eastwood <madlittlemods@gmail.com> <contact@ericeastwood.com>
+Eric Joldasov <bratishkaerik@landless-city.net>
+Eric Joldasov <bratishkaerik@landless-city.net> <bratishkaerik@landless-city.net>
 Felix "xq" Queißner <xq@random-projects.net>
 Felix "xq" Queißner <xq@random-projects.net> <felix@ib-queissner.de>
 Felix "xq" Queißner <xq@random-projects.net> <git@masterq32.de>
@@ -17,12 +19,16 @@ Felix "xq" Queißner <xq@random-projects.net> <git@random-projects.net>
 Frank Denis <124872+jedisct1@users.noreply.github.com> <github@pureftpd.org>
 Garrett Beck <garrettlennoxbeck@gmail.com> <138411610+garrettlennoxbeck@users.noreply.github.com>
 Gaëtan S <blaxoujunior@gmail.com>
+GalaxyShard <dominic.adragna@byteroach.com>
+GalaxyShard <dominic.adragna@byteroach.com> <76917584+GalaxyShard@users.noreply.github.com>
 HydroH <iodizon@163.com> <ixlesis@gmail.com>
 Igor Anić <igor.anic@gmail.com>
 IntegratedQuantum <jahe788@gmail.com> <43880493+IntegratedQuantum@users.noreply.github.com>
 Isaac Freund <mail@isaacfreund.com> <ifreund@ifreund.xyz>
 Isaac Freund <mail@isaacfreund.com> <isaac.freund@coil.com>
-Jacob Young <jacobly0@users.noreply.github.com>
+Jacob Young <amazingjacob@gmail.com>
+Jacob Young <amazingjacob@gmail.com> <jacobly0@users.noreply.github.com>
+Jacob Young <amazingjacob@gmail.com> <15544577+jacobly0@users.noreply.github.com>
 Jan Philipp Hafer <jan.hafer@rwth-aachen.de> <anon_1plus1equals3@mailbox.org>
 Jeremy Volkman <jeremy@jvolkman.com> <jeremy@cedarai.com>
 Jimmi Holst Christensen <jhc@dismail.de> <jhc@dismail.de>
@@ -35,10 +41,15 @@ Jonathan Marler <johnnymarler@gmail.com> <jonathan.j.marler@hp.com>
 Krzysztof Wolicki <der.teufel.mail@gmail.com>
 Krzysztof Wolicki <der.teufel.mail@gmail.com> <46651553+der-teufel-programming@users.noreply.github.com>
 LemonBoy <thatlemon@gmail.com> <LemonBoy@users.noreply.github.com>
+Lucas Santos <lucascarvalhosantos91@gmail.com>
+Lucas Santos <lucascarvalhosantos91@gmail.com> <117400842+LucasSantos91@users.noreply.github.com>
 Luuk de Gram <luuk@degram.dev> <Luukdegram@users.noreply.github.com>
 Marc Tiehuis <marc@tiehu.is> <marctiehuis@gmail.com>
+Mason Remaley <mason@anthropicstudios.com>
+Mason Remaley <mason@anthropicstudios.com> <MasonRemaley@users.noreply.github.com>
 Matthew Lugg <mlugg@mlugg.co.uk>
 Meghan Denny <hello@nektro.net>
+Meghan Denny <hello@nektro.net> <meghan@bun.sh>
 Michael Bartnett <michael.bartnett@gmail.com> <michaelbartnett@users.noreply.github.com>
 Motiejus Jakštys <motiejus@jakstys.lt> <motiejus@uber.com>
 Niles Salter <Validark@pm.me>
@@ -58,9 +69,15 @@ Travis Staloch <twostepted@gmail.com>
 Travis Staloch <twostepted@gmail.com> <1562827+travisstaloch@users.noreply.github.com>
 Veikka Tuominen <git@vexu.eu>
 Veikka Tuominen <git@vexu.eu> <15308111+Vexu@users.noreply.github.com>
+Will Lillis <will.lillis24@gmail.com>
+Will Lillis <will.lillis24@gmail.com> <wlillis@umass.edu>
 Wooster <r00ster91@proton.me>
 Wooster <r00ster91@proton.me> <wooster0@proton.me>
 antlilja <liljaanton2001@gmail.com> <12533691+antlilja@users.noreply.github.com>
 february cozzocrea <february.cozzocrea@gmail.com> <91439207+f-cozzocrea@users.noreply.github.com>
 garrisonhh <garrisonhh@pm.me> <71951273+garrisonhh@users.noreply.github.com>
+kj4tmp <kj4tmp@gmail.com>
+kj4tmp <kj4tmp@gmail.com> <56497124+kj4tmp@users.noreply.github.com>
+saurabh <saurabhm@proton.me>
+saurabh <tech@saurabh.mozmail.com> <saurabhm@proton.me>
 xEgoist <egoist@egoistic.dev> <101279047+xEgoist@users.noreply.github.com>