diff --git a/.mailmap b/.mailmap
index 9a650dd5da..a27e49e9f5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,7 +11,7 @@ Aleisha Amohia <aleisha@catalystacademy.net.nz>               <aleishaamohia@hot
 Alexandra Horsman <alex@catalystacademy.net.nz>               <dhorsman@xtra.co.nz>
 Alex Arnaud                                                   <alex.arnaud@biblibre.com>
 Alex Arnaud <alex.arnaud@biblibre.com>                        = <=>
-Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>   A. Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
+Alex Sassmannshausen <alex.sassmannshausen@openfifth.co.uk>   A. Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
 Allen Reinmeyer <allen.reinmeyer@liblime.com>                 Allen Reinmeyer <acr@arwen.metavore.com>
 Ambrose Li <ambrose.li@gmail.com>                             acli <acli>
 Amit Gupta <amit.gupta@osslabs.biz>                           amit gupta <amit.gupta@osslabs.biz>
@@ -23,7 +23,7 @@ Antoine Farnault <toins@biblibre.com>                         <toins>
 Arnaud Laurin <alaurin@biblibre.com>                          <alaurin>
 Arnaud Laurin                                                 <alaurin@biblibre.com>
 Artur Norrby                                                  <artur.norrby@gmail.com>
-Aude Charillon <aude.charillon@ptfs-europe.com>               <aude.charillon@ptfs-europe.com>
+Aude Charillon <aude.charillon@openfifth.co.uk>               <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>
@@ -150,7 +150,7 @@ Ian Walls                                                     <ian.walls@bywater
 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>
-Jake Deery <jake.deery@ptfs-europe.com>                       PerplexedTheta <jahdobble@llownd.net>
+Jake Deery <jake.deery@openfifth.co.uk>                       PerplexedTheta <jahdobble@llownd.net>
 Jake Deery                                                    <jake.deery@ptfs-europe.com>
 Jane Wagner <jwagner@ptfs.com>                                <dev2@debKOHA2.corporate.ptfs.com>
 Janusz Kaczmarek                                              <januszop@gmail.com>
@@ -231,7 +231,7 @@ Marcel de Rooy <m.de.rooy@rijksmuseum.nl>                     <root@master.rijks
 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>
+Martin Renvoize <martin.renvoize@openfifth.co.uk>             <martin@dev1.vm.bytemark.co.uk>
 Mason James                                                   <mason.james@liblime.com>
 Mason James <mason@katipo.co.nz>                              sushi <sushi>
 Mason James <mason@katipo.co.nz>                              szrj1m <szrj1m>
@@ -388,3 +388,19 @@ Vermont Organization of Koha Automated Libraries <sponsor>    VOKAL <sponsor>
 Vermont Organization of Koha Automated Libraries <sponsor>    Vermont Organization of Koha Automated Libraries [http://gmlc.org/index.php/vokal] <sponsor>
 Virginia Tech <sponsor>                                       Virginia Tech [https://lib.vt.edu/] <sponsor>
 Waitaki Distict Council <sponsor>                             Waitaki Distict Council, NZ <sponsor>
+Alex Sassmannshausen <alex.sassmannshausen@openfifth.co.uk>   <alex.sassmannshausen@ptfs-europe.com>
+Andrew Auld <andrew.auld@openfifth.co.uk>                     <andrew.auld@ptfs-europe.com>
+Andrew Isherwood <andrew.isherwood@openfifth.co.uk>           <andrew.isherwood@ptfs-europe.com>
+Aude Charillon <aude.charillon@openfifth.co.uk>               <aude.charillon@ptfs-europe.com>
+Chloe Zermatten <chloe.zermatten@openfifth.co.uk>             <chloe.zermatten@ptfs-europe.com>
+Colin Campbell <colin.campbell@openfifth.co.uk>               <colin.campbell@ptfs-europe.com>
+David Roberts <david.roberts@openfifth.co.uk>                 <david.roberts@ptfs-europe.com>
+Jacob O'Mara <jacob.omara@openfifth.co.uk>                    <jacob.omara@ptfs-europe.com>
+Jake Deery <jake.deery@openfifth.co.uk>                       <jake.deery@ptfs-europe.com>
+Janet McGowan <janet.mcgowan@openfifth.co.uk>                 <janet.mcgowan@ptfs-europe.com>
+Jonathan Field <jonathan.field@openfifth.co.uk>               <jonathan.field@ptfs-europe.com>
+Mark Gavillet <mark.gavillet@openfifth.co.uk>                 <mark.gavillet@ptfs-europe.com>
+Martin Renvoize <martin.renvoize@openfifth.co.uk>             <martin.renvoize@ptfs-europe.com>
+Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk>             <matt.blenkinsip@ptfs-europe.com>
+Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk>             <matt.blenkinsop@ptfs-europe.com>
+Pedro Amorim <pedro.amorim@openfifth.co.uk>                   <pedro.amorim@ptfs-europe.com>