diff --git a/.mailmap b/.mailmap
index d7286b94c..f0d44d96a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,8 +14,11 @@ Peter Dave Hello <hsu@peterdavehello.org>    Peter Dave Hello <PeterDaveHello@us
 Claudius Coenen <github@amenthes.de>         Claudius Coenen <opensource@amenthes.de>
 
 Tilman Vatteroth <git@tilmanvatteroth.de>    Tilman Vatteroth <tilman.vatteroth@tu-dortmund.de>
+Tilman Vatteroth <git@tilmanvatteroth.de>    mrdrogdrog <mr.drogdrog@gmail.com>
+Tilman Vatteroth <git@tilmanvatteroth.de>    mrdrogdrog <tilman.vatteroth@tu-dortmund.de>
 
 Philip Molares <philip.molares@udo.edu>      Philip Molares <git@molar.es>
+Philip Molares <philip.molares@udo.edu>      Philip Molares <philip@mauricedoepke.de>
 
 Yannick Bungers <git@innay.de>               Yannick Bungers <github@innay.de>
 
@@ -23,3 +26,7 @@ Jonas Zohren <git-pbkyr@jzohren.de>          Jonas Zohren <jonas.zohren@adesso.d
 Jonas Zohren <git-pbkyr@jzohren.de>          Jonas Zohren <15788906+jfowl@users.noreply.github.com>
 
 Renovate Bot <bot@renovateapp.com>           renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
+
+Tamotsu Takahashi <ttakah+github@gmail.com>  TAKAHASHI Tamotsu <ttakah+github@gmail.com>
+
+Avinash <avinash.kumar.cs92@gmail.com>       Avinash <avinash.kumar@renegadeinsurance.com>
diff --git a/AUTHORS b/AUTHORS
index 650d54fef..8abeff75f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,20 +13,27 @@ To regenerate, use `git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf`.
 
 Abhilasha Sinha <abhisinha662000@gmail.com>
 Alexandru Văleanu <valeanu_alex@yahoo.com>
+Avinash <avinash.kumar.cs92@gmail.com>
 Chasethechicken <neuringe1234@gmail.com>
 David Mehren <git@herrmehren.de>
 Erik Michelson <github@erik.michelson.eu>
 Falk Rehse <neuringe1234@gmail.com>
+Henrik Hüttemann <admin@herh.de>
 Hugo Peixoto <hugo.peixoto@gmail.com>
+Jakob Klepp <jakob-github@truh.in>
 Jonas Zohren <git-pbkyr@jzohren.de>
+Juned Khan <junedkhanc101@gmail.com>
+Lautaro Alvarez <lautarolalvarez@gmail.com>
+Lukas Mertens <git@lukas-mertens.de>
 Nicolas Dietrich <nidi@mailbox.org>
 Nicolas Lenz <nicolas@eisfunke.com>
 Philip Molares <philip.molares@udo.edu>
 Renovate Bot <bot@renovateapp.com>
+SHAN michel <yuplasmas@gmail.com>
 Sheogorath <sheogorath@shivering-isles.com>
 Simon C <simonc@linux.com>
+Stéphane Guillou <stephane.guillou@member.fsf.org>
+Tamotsu Takahashi <ttakah+github@gmail.com>
 Thomas Snowden <zapperchamp1@gmail.com>
 Tilman Vatteroth <git@tilmanvatteroth.de>
 Yannick Bungers <git@innay.de>
-Henrik Hüttemann <admin@herh.de>
-Jakob Klepp <jakob-github@truh.in>