diff --git a/.mailmap b/.mailmap
index 6248917e68515d..4f14853f5be35e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -221,9 +221,10 @@ James Beavers <jamesjbeavers@gmail.com>
 James Bromwell <james.bromwell@gdit.com> <943160+thw0rted@users.noreply.github.com>
 James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 James Ide <ide@jameside.com> <ide@expo.io>
+James Ide <ide@jameside.com> <ide@users.noreply.github.com>
 James M Snell <jasnell@gmail.com>
 James Nimlos <james@nimlos.com>
-James Sumners <james@sumners.email> <james.sumners@gmail.com> 
+James Sumners <james@sumners.email> <james.sumners@gmail.com>
 Jan Krems <jan.krems@gmail.com> <jan.krems@groupon.com>
 Jem Bezooyen <github@jem.dev> <jem@hipmedia.ca>
 Jem Bezooyen <github@jem.dev> <jem@sendwithus.com>
@@ -241,7 +242,7 @@ Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
 Jimb Esser <wasteland@gmail.com> <jimb@railgun3d.com>
 Jithil P Ponnan <jithil@outlook.com>
 Jithil P Ponnan <jithil@outlook.com> <MrJithil@users.noreply.github.com>
-Jochen Eisinger <jochen@chromium.org> 
+Jochen Eisinger <jochen@chromium.org>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 029eb68e36640f..1cc18b7775cb7a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3481,5 +3481,10 @@ Alena Khineika <alena.khineika@gmail.com>
 Basit <1305718+mabaasit@users.noreply.github.com>
 Kid <44045911+kidonng@users.noreply.github.com>
 Jeremy Rose <japthorp@slack-corp.com>
+Facundo Tuesca <facundo.tuesca@trailofbits.com>
+Dan Castillo <dancastillo99@gmail.com>
+Varun Sharma <varunsh@stepsecurity.io>
+txxnano <warkanlock@gmail.com>
+Jannis R <mail@jannisr.de>
 
 # Generated by tools/update-authors.mjs