diff --git a/.mailmap b/.mailmap
index 7e17d82d7..5aa1eef46 100644
--- a/.mailmap
+++ b/.mailmap
@@ -208,6 +208,7 @@ Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.
 Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
 Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
 Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
+XDTG <click1799@163.com> <35128600+XDTG@users.noreply.github.com>
 xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com>
 Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com>
 Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index 09814b435..6a5cc088e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -248,6 +248,7 @@ CONTRIBUTORS:
     Gian-Carlo DeFazio <defazio1@llnl.gov>
     Gionatan Danti <g.danti@assyoma.it>
     Giuseppe Di Natale <guss80@gmail.com>
+    Gleb Smirnoff <glebius@FreeBSD.org>
     Glenn Washburn <development@efficientek.com>
     glibg10b <glibg10b@users.noreply.github.com>
     gofaster <felix.gofaster@gmail.com>
@@ -565,6 +566,7 @@ CONTRIBUTORS:
     Sen Haerens <sen@senhaerens.be>
     Serapheim Dimitropoulos <serapheim@delphix.com>
     Seth Forshee <seth.forshee@canonical.com>
+    Seth Hoffert <Seth.Hoffert@gmail.com>
     Seth Troisi <sethtroisi@google.com>
     Shaan Nobee <sniper111@gmail.com>
     Shampavman <sham.pavman@nexenta.com>
@@ -598,6 +600,7 @@ CONTRIBUTORS:
     Tamas TEVESZ <ice@extreme.hu>
     Teodor Spæren <teodor_spaeren@riseup.net>
     TerraTech <TerraTech@users.noreply.github.com>
+    Theera K. <tkittich@hotmail.com>
     Thijs Cramer <thijs.cramer@gmail.com>
     Thomas Bertschinger <bertschinger@lanl.gov>
     Thomas Geppert <geppi@digitx.de>
@@ -648,6 +651,7 @@ CONTRIBUTORS:
     Windel Bouwman <windel@windel.nl>
     Wojciech Małota-Wójcik <outofforest@users.noreply.github.com>
     Wolfgang Bumiller <w.bumiller@proxmox.com>
+    XDTG <click1799@163.com>
     Xin Li <delphij@FreeBSD.org>
     Xinliang Liu <xinliang.liu@linaro.org>
     xtouqh <xtouqh@hotmail.com>