diff --git a/.mailmap b/.mailmap
index eeea03e027..601a0dd5b5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,11 +17,14 @@ Ambrose Li <ambrose.li@gmail.com>                             acli <acli>
 Amit Gupta <amit.gupta@osslabs.biz>                           amit gupta <amit.gupta@osslabs.biz>
 Andrew Arensburger <arensb@gmail.com>                         <arensb>
 Andrew Elwell <andrew.elwell@gmail.com>                       <Andrew.Elwell@gmail.com>
+Andrew Fuerste-Henry <andrewfh@dubcolib.org>                  <andrewfh@dubcolib.org>
 Antoine Farnault <toins@biblibre.com>                         <toins>
 Arnaud Laurin <alaurin@biblibre.com>                          <alaurin>
 Arnaud Laurin                                                 <alaurin@biblibre.com>
+Aude Charillon <aude.charillon@ptfs-europe.com>               <aude.charillon@ptfs-europe.com>
 Ava Li                                                        <rubyli208@gmail.com>
 Azucena Aguayo                                                <Azucena.Aguayo@uvu.edu>
+Baptiste Bayche <baptiste.bayche@inlibro.com>                 <baptiste.bayche@inlibro.com>
 <bart@catalystacademy.net.nz>                                 <bart.tj@gmail.com>
 Barton Chittenden                                             <barton@bywatersolutions.com>
 Benedict P. Barszcz                                           <kb2qzv>
@@ -68,6 +71,7 @@ Colin Campbell                                                <colin.campbell@pt
 <connor.dewar@catalystacademy.net.nz>                         <connor.dewar@gmail.com>
 Daniel Banzli                                                 <daniel.buenzli@erratique.ch>
 Daniel Barker <daniel@catalystacademy.net.nz>                 <daniel.barker.nz@gmail.com>
+Danyon Sewell <danyonsewell@catalyst.net.nz>                  <danyonsewell@catalyst.net.nz>
 Darrell Ulm <darrellulm@smfpl.org>                            Darrell Ulm <darrellulm@kohavmware>
 Darrell Ulm <darrellulm@smfpl.org>                            Darrell Ulm <darrellulm@smfpl.org>
 Darrell Ulm <darrellulm@smfpl.org>                            koha <koha@smfpl.org>
@@ -97,6 +101,7 @@ Emma Nakamura Smith                                           <emma.nakamura.smi
 Emma Nakamura Smith <emma.nakamura.smith@gmail.com>           Your Full Name <your_email>
 Emmi Takkinen                                                 <emmi.takkinen@outlook.com>
 Eric Phetteplace                                              <phette23@gmail.com>
+Esther Melander <esther@bywatersolutions.com>                 <esther@bywatersolutions.com>
 Father Vlasie                                                 <fv@spots.school>
 Fernando Canizo                                               <conan@lugmen.org.ar>
 Finlay Thompson <finlay@katipo.co.nz>                         <finlayt>
@@ -125,14 +130,17 @@ Gus Ellerm                                                    <gel1163@stacmail.
 Gynn Lomax <gynn@katipo.co.nz>                                truth_nz <truth_nz>
 Hayley Pelham                                                 <hayleymapley@catalyst.net.nz>
 Héctor Eduardo Castro Avalos                                  <hector.hecaxmmx@gmail.com>
+Hebah Amin-Headley <hebah@bywatersolutions.com>               <hebah@bywatersolutions.com>
 Helene Hickey                                                 <hickeyhe@wgc.school.nz>
 Henri-Damien LAURENT                                          <henridamien.laurent@biblibre.com>
 Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       hdl <hdl>
 Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       Henri-Damien LAURENT <henridamien@koha-fr.org>
 Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       <root@descartes.biblibre.com>
 Henri-Damien LAURENT <henridamien.laurent@biblibre.com>       <root@henridamienlaurent.dyndns.org>
+Hinemoea Viault <hinemoea.viault@inlibro.com>                 <hinemoea@inlibro.com>
 Holger Meißner <holger.meissner@hs-gesundheit.de>             <h.meissner.82@web.de>
 Holly Cooper                                                  <hc@interleaf.ie>
+Hugo Agud <hagud@orex.es>                                     Signed-off-by: Hugo Agud <hagud@orex.es>
 H. Passini                                                    <hpassini>
 Ian Walls                                                     <hsl@nyumc.org>
 Ian Walls                                                     <ian.walls@bywatersolutions.com>
@@ -194,6 +202,7 @@ Kyle M Hall <kyle@bywatersolutions.com>                       koha <koha@localho
 Kyle M Hall <kyle@bywatersolutions.com>                       <koha@mtpl.bywatersolutions.com>
 Kyle M Hall <kyle@bywatersolutions.com>                       <kyle@bywatersolutions.com>
 Kyle M Hall <kyle@bywatersolutions.com>                       <kyle.m.hall@gmail.com>
+Lari Strand <lmstrand@gmail.com>                              <lmstrand@gmail.com>
 Larry Baerveldt                                               <larry@bywatersolutions.com>
 Leire Diez                                                    <leire@scanbit.net>
 Liz Rea                                                       <liz@catalyst.net.nz>
@@ -215,6 +224,7 @@ Marcel de Rooy <m.de.rooy@rijksmuseum.nl>                     <M.de.Rooy@rijksmu
 Marcel de Rooy <m.de.rooy@rijksmuseum.nl>                     <root@master.rijkskoha.nl>
 Marc Véron                                                    <veron@veron.ch>
 Marjorie Barry-Vila                                           <marjorie.barry-vila@collecto.ca
+Martin Aubeut <martin.aubeut@gmail.com>                       <martin.aubeut@gmail.com>
 Martin Renvoize <martin.renvoize@ptfs-europe.com>             <martin@dev1.vm.bytemark.co.uk>
 Mason James                                                   <mason.james@liblime.com>
 Mason James <mason@katipo.co.nz>                              sushi <sushi>
@@ -226,6 +236,8 @@ Mason James <mtj@liblime.com>                                 <mason@snaga.libli
 Mason James                                                   <mtj@kohaaloha.com>
 Mason James <mtj@kohaaloha.com>                               QA Manager <patches@koha.org>
 Mason James <mtj@kohaaloha.com>                               <szrj5m>
+Matthias Le Gac <matthias@babel.inlibro.net>                  matthias le gac <matthias@babel.inlibro.net>
+Matthias Le Gac <matthias@babel.inlibro.net>                  <matthias@babel.inlibro.net>
 Matthias Meusburger                                           <matthias.meusburger@biblibre.com>
 Maxime Beaulieu                                               <maxime.beaulieu@inlibro.com>
 Maxime Beaulieu <maxime.beaulieu@inlibro.com>                 <mbeaulieu@inlibro.com>
@@ -235,6 +247,7 @@ Merllissia Manueli <mel@catalystacademy.net.nz>               <manuelimel@gmail.
 Mengü Yazıcıoğlu                                              <kohadevinim@devinim.com.tr>
 Michael Hafen <mdhafen@washk12.org>                           <mdhafen@tech.washk12.org>
 Michel Lerenard                                               <zifox>
+Michelle Spinney <mspinney@clamsnet.org>                      Michelle <mspinney@clamsnet.org>
 Mike Hansen <wolfpac444>                                      <wolfpac444>
 Mike Mylonas <dragon28@ihug.co.nz>                            <dragon28>
 MJ Ray                                                        <mjr@phonecoop.coop>
@@ -292,6 +305,7 @@ Roger Buck                                                    <saas>
 Russel Garlick <russel.garlick@liblime.com>                   <russel@ahinui.local>
 Ryan Higgins <rch@balrog.liblime.com>                         <rch@false.(none)>
 Ryan Higgins <rch@liblime.com>                                <rych>
+Sabrina Kiehl <kiehl@mpis.mpg.de>                             <kiehl@mpis.mpg.de>
 Sally Healey                                                  <sally.Healey@cheshirewestandchester.gov.uk>
 Sally Healey                                                  <sally.healey@cheshiresharedservices.gov.uk>
 Salman Ali                                                    <salman.ali@inLibro.com>
@@ -315,6 +329,7 @@ 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>
+Stina Hallin <stina.hallin@ub.lu.se>                          <stina.hallin@ub.lu.se>
 The Minh Luong                                                <theminh@inlibro.com>
 The Minh Luong                                                <the-minh.luong@inlibro.com>
 Thibaud Guillot                                               <thibaud.guillot@biblibre.com>