diff --git a/.mailmap b/.mailmap
index 3397fbc37..377a511be 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,6 +53,7 @@ Jason Harmening <jason.harmening@gmail.com>
 Jeremy Faulkner <gldisater@gmail.com>
 Jinshan Xiong <jinshan.xiong@gmail.com>
 John Poduska <jpoduska@datto.com>
+Joseph Holsten <joseph@josephholsten.com>
 Jo Zzsi <jozzsicsataban@gmail.com>
 Justin Scholz <git@justinscholz.de>
 Ka Ho Ng <khng300@gmail.com>
@@ -72,10 +73,12 @@ Roberto Ricci <io@r-ricci.it>
 Roberto Ricci <ricci@disroot.org>
 Rob Norris <robn@despairlabs.com>
 Rob Norris <rob.norris@klarasystems.com>
+Rob Norris <rob.norris@truenas.com>
 Sam Lunt <samuel.j.lunt@gmail.com>
 Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
 Sebastian Wuerl <s.wuerl@mailbox.org>
 SHENGYI HONG <aokblast@FreeBSD.org>
+Sivesh Kumar <siveshjami@gmail.com>
 Stoiko Ivanov <github@nomore.at>
 Tamas TEVESZ <ice@extreme.hu>
 WHR <msl0000023508@gmail.com>
@@ -83,8 +86,12 @@ Yanping Gao <yanping.gao@xtaotech.com>
 Youzhong Yang <youzhong@gmail.com>
 
 # Signed-off-by: overriding Author:
+Alexander Moch <mail@alexmoch.com> <amoch@ernw.de>
+Alexander Moch <mail@alexmoch.com> <github@alexanderjulian.de>
 Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com>
+delan azabani <dazabani@igalia.com> <delan@azabani.com>
 Felix Schmidt <felixschmidt20@aol.com> <f.sch.prototype@gmail.com>
+George Shammas <george@shamm.as> <georgyo@gmail.com>
 Jean-Sébastien Pédron <dumbbell@FreeBSD.org> <jean-sebastien.pedron@dumbbell.fr>
 Konstantin Belousov <kib@FreeBSD.org> <kib@kib.kiev.ua>
 Olivier Certner <olce@FreeBSD.org> <olce.freebsd@certner.fr>
@@ -108,6 +115,7 @@ Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)>
 Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
 
 # Mappings from Github no-reply addresses
+Adi Gollamudi <adigollamudi@gmail.com> <68113680+Adi-Goll@users.noreply.github.com>
 ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
 Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
 Aleksandr Liber <aleksandr.liber@perforce.com> <61714074+AleksandrLiber@users.noreply.github.com>
@@ -125,6 +133,7 @@ bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.co
 Bojan Novković <bnovkov@FreeBSD.org> <72801811+bnovkov@users.noreply.github.com>
 Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
 Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
+Brad Spengler <94915855+bspengler-oss@users.noreply.github.com>>
 Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
 buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
 Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
@@ -138,6 +147,7 @@ Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com
 Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
 David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
 Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com>
+Dennis Vestergaard Værum <github@varum.dk> <6872940+dvaerum@users.noreply.github.com>
 Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com>
 DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
 Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index e496c0e8a..7174b7d66 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ CONTRIBUTORS:
     Adam D. Moss <c@yotes.com>
     Adam Leventhal <ahl@delphix.com>
     Adam Stevko <adam.stevko@gmail.com>
+    Adi Gollamudi <adigollamudi@gmail.com>
     adisbladis <adis@blad.is>
     Adrian Chadd <adrian@freebsd.org>
     Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
@@ -32,8 +33,10 @@ CONTRIBUTORS:
     Alek Pinchuk <alek@nexenta.com>
     Aleksandr Liber <aleksandr.liber@perforce.com>
     Aleksa Sarai <cyphar@cyphar.com>
+    Alex <simplecodemaster@gmail.com>
     Alexander Eremin <a.eremin@nexenta.com>
     Alexander Lobakin <alobakin@pm.me>
+    Alexander Moch <mail@alexmoch.com>
     Alexander Motin <mav@freebsd.org>
     Alexander Pyhalov <apyhalov@gmail.com>
     Alexander Richardson <Alexander.Richardson@cl.cam.ac.uk>
@@ -46,6 +49,7 @@ CONTRIBUTORS:
     Alex McWhirter <alexmcwhirter@triadic.us>
     Alex Reece <alex@delphix.com>
     Alex Wilson <alex.wilson@joyent.com>
+    Alexx Saver <lzsaver.eth@ethermail.io>
     Alex Zhuravlev <alexey.zhuravlev@intel.com>
     Allan Jude <allanjude@freebsd.org>
     Allen Holl <allen.m.holl@gmail.com>
@@ -89,6 +93,7 @@ CONTRIBUTORS:
     Arun KV <arun.kv@datacore.com>
     Arvind Sankar <nivedita@alum.mit.edu>
     Attila Fülöp <attila@fueloep.org>
+    Austin Wise <AustinWise@gmail.com>
     Avatat <kontakt@avatat.pl>
     Bart Coddens <bart.coddens@gmail.com>
     Basil Crow <basil.crow@delphix.com>
@@ -110,6 +115,7 @@ CONTRIBUTORS:
     Boris Protopopov <boris.protopopov@nexenta.com>
     Brad Forschinger <github@bnjf.id.au>
     Brad Lewis <brad.lewis@delphix.com>
+    Brad Spengler <bspengler-oss@users.noreply.github.com>
     Brandon Thetford <brandon@dodecatec.com>
     Brian Atkinson <bwa@g.clemson.edu>
     Brian Behlendorf <behlendorf1@llnl.gov>
@@ -196,7 +202,9 @@ CONTRIBUTORS:
     David Quigley <david.quigley@intel.com>
     Debabrata Banerjee <dbanerje@akamai.com>
     D. Ebdrup <debdrup@freebsd.org>
+    delan azabani <dazabani@igalia.com>
     Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com>
+    Dennis Vestergaard Værum <github@varum.dk>
     Denys Rtveliashvili <denys@rtveliashvili.name>
     Derek Dai <daiderek@gmail.com>
     Derek Schrock <dereks@lifeofadishwasher.com>
@@ -223,6 +231,7 @@ CONTRIBUTORS:
     Eric Desrochers <eric.desrochers@canonical.com>
     Eric Dillmann <eric@jave.fr>
     Eric Schrock <Eric.Schrock@delphix.com>
+    Erik Larsson <catacombae@gmail.com>
     Ethan Coe-Renner <coerenner1@llnl.gov>
     Etienne Dechamps <etienne@edechamps.fr>
     Evan Allrich <eallrich@gmail.com>
@@ -255,6 +264,7 @@ CONTRIBUTORS:
     George Diamantopoulos <georgediam@gmail.com>
     George Gaydarov <git@gg7.io>
     George Melikov <mail@gmelikov.ru>
+    George Shammas <george@shamm.as>
     George Wilson <gwilson@delphix.com>
     Georgy Yakovlev <ya@sysdump.net>
     Gerardwx <gerardw@alum.mit.edu>
@@ -343,6 +353,7 @@ CONTRIBUTORS:
     Joe Stein <joe.stein@delphix.com>
     John-Mark Gurney <jmg@funkthat.com>
     John Albietz <inthecloud247@gmail.com>
+    John Cabaj <john.cabaj@canonical.com>
     John Eismeier <john.eismeier@gmail.com>
     John Gallagher <john.gallagher@delphix.com>
     John Layman <jlayman@sagecloud.com>
@@ -358,6 +369,7 @@ CONTRIBUTORS:
     Jorgen Lundman <lundman@lundman.net>
     Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
     Jose Luis Duran <jlduran@gmail.com>
+    Joseph Holsten <joseph@josephholsten.com>
     Josh Soref <jsoref@users.noreply.github.com>
     Joshua M. Clulow <josh@sysmgr.org>
     José Luis Salvador Rufo <salvador.joseluis@gmail.com>
@@ -622,6 +634,7 @@ CONTRIBUTORS:
     Simon Guest <simon.guest@tesujimath.org>
     Simon Howard <fraggle@soulsphere.org>
     Simon Klinkert <simon.klinkert@gmail.com>
+    Sivesh Kumar <siveshjami@gmail.com>
     Sowrabha Gopal <sowrabha.gopal@delphix.com>
     Spencer Kinny <spencerkinny1995@gmail.com>
     Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com>
@@ -704,6 +717,7 @@ CONTRIBUTORS:
     Windel Bouwman <windel@windel.nl>
     Wojciech Małota-Wójcik <outofforest@users.noreply.github.com>
     Wolfgang Bumiller <w.bumiller@proxmox.com>
+    Wolfgang Hoschek <wolfgang.hoschek@mac.com>
     XDTG <click1799@163.com>
     Xin Li <delphij@FreeBSD.org>
     Xinliang Liu <xinliang.liu@linaro.org>