diff --git a/.mailmap b/.mailmap
index d5af8e859a..cb837e2be7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Abby Robertson                                                <abbyrobnz@gmail.com>
+Adam Styles                                                   <adam.styles@esa.edu.au>
 Agustín Moyano                                                <agustinmoyano@theke.io>
 Ahmed                                                         <ahmed@inlibro.com>
 Alan Millar                                                   <amillar>
@@ -72,6 +73,7 @@ Darrell Ulm <darrellulm@smfpl.org>                            koha <koha@smfpl.o
 Darrell Ulm <darrellulm@smfpl.org>                            root <root@newkoha32.local>
 David Cook                                                    <dcook@prosentient.com.au>
 David Gustafsson <glasklas@gmail.com>                         <root@f1ebe1bec408>
+David Schmidt                                                 <davewood@gmx.at>
 David Schuster                                                <dschust1@gmail.com>
 David Strainchamps                                            <lavide>
 Dobrica Pavlinušić                                            <dpavlin@rot13.org>
@@ -134,6 +136,7 @@ Ian Walls                                                     <hsl@nyumc.org>
 Ian Walls                                                     <ian.walls@bywatersolutions.com>
 Ian Walls <koha.sekjal@gmail.com>                             <sekjal@Samael.local>
 Indranil Das Gupta <indradg@l2c2.co.in>                       Indranil Das Gupta (L2C2 Technologies) <indradg@l2c2.co.in>
+Jake                                                          Deery <jake.deery@ptfs-europe.com>
 Jane Wagner <jwagner@ptfs.com>                                <dev2@debKOHA2.corporate.ptfs.com>
 Janusz Kaczmarek                                              <januszop@gmail.com>
 Jared Camins-Esakov <jcamins@cpbibliography.com>              <camins@numismatics.org>
@@ -177,6 +180,7 @@ Katrin Fischer <katrin.fischer@bsz-bw.de>                     <Katrin.Fischer@bs
 Katrin Fischer <katrin.fischer@bsz-bw.de>                     Koha <koha@koha-dev.de>
 Kelly McElligott                                              <kelly@bywatersolutions.com>
 Kenza Zaki <kenza.zaki@biblibre.com>                          <root@kenza-VirtualBox>
+Kevin Carnes                                                  <kevin.carnes@ub.lu.se>
 Koha Translators                                              <root@translate.koha-community.org>
 Kyle M Hall <kyle@bywatersolutions.com>                       <migrations@bywatersolutions.com>
 Kyle M Hall <kyle@bywatersolutions.com>                       <“staff@bywatersolutions.com”>
@@ -286,6 +290,7 @@ Ryan Higgins <rch@balrog.liblime.com>                         <rch@false.(none)>
 Ryan Higgins <rch@liblime.com>                                <rych>
 Sally Healey                                                  <sally.Healey@cheshirewestandchester.gov.uk>
 Sally Healey                                                  <sally.healey@cheshiresharedservices.gov.uk>
+Salman Ali                                                    <salman.ali@inLibro.com>
 Sam Sanders <sam-sanders@catalystacademy.net.nz>              <sam-sanders@live.com>
 Samuel Crosby                                                 <scrosby000@gmail.com>
 Savitra Sirohi                                                <savitra.sirohi@osslabs.biz>
@@ -293,6 +298,8 @@ Serge Renaux                                                  <sergerenaux>
 Séverine Queune                                               <severine.queune@bulac.fr>
 Séverine Queune                                               <severine.queune@gmail.com>
 Shaun Evans                                                   <shaunevans>
+Shi Yao Wang                                                  <shi-yao.wang@inlibro.com>
+Shi Yao Wang                                                  <shiyao@inlibro.com>
 Silvia Simonetti                                              <s.simonetti@cineca.it>
 Simith D'Oliveira                                             <simith@inlibro.com>
 Simon Blake <simon@katipo.co.nz>                              <simon>
@@ -304,6 +311,8 @@ Stan Brinkerhoff <stan@brinkerhoff.org>                       <stan@koha-dev.hsd
 Stéphane Delaune                                              <stephane.delaune@biblibre.com>
 Stephen Hedges <shedges@myacpl.org>                           <shedges>
 Steve Tonnesen                                                <tonnesen>
+The Minh Luong                                                <theminh@inlibro.com>
+The Minh Luong                                                <the-minh.luong@inlibro.com>
 Thibaud Guillot                                               <thibaud.guillot@biblibre.com>
 Thomas Dukleth <git@agogme.com>                               <git@agogme.com>
 Thomas Dukleth <git@agogme.com>                               <thd>
@@ -330,6 +339,7 @@ Association KohaLa <sponsor>                                  Association KohaLa
 Bibliothèque Universitaire des Langues et Civilisations (BULAC) <sponsor> BULAC - http://www.bulac.fr/ <sponsor>
 Bibliotheksservice-Zentrum Baden-Württemberg (BSZ) <sponsor>  Bibliotheksservice-Zentrum Baden-Wuerttemberg <sponsor>
 Catalyst <sponsor>                                            Catalyst IT <sponsor>
+Catalyst <sponsor>                                            Catalyst IT, New Zealand <sponsor>
 Centre collégial des services regroupés <sponsor>             CCSR <sponsor>
 Centre collégial des services regroupés <sponsor>             CCSR ( http://www.ccsr.qc.ca ) <sponsor>
 Dataly Tech <sponsor>                                         Dataly Tech [https://dataly.gr/] <sponsor>