diff --git a/.mailmap b/.mailmap
index f9a4d7cc5c..f2a37440b0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,6 +37,9 @@ Paul Poulain                    <paul.poulain@biblibre.com>
 Robin Sheat                     <robin@catalyst.net.nz>
 Srdjan Jankovic                 <srdjan@catalyst.net.nz>
 Tomás Cohen Arazi               <tomascohen@gmail.com>
+Tomás Cohen Arazi               <tcohen@psi.unc.edu.ar>
+Bernardo González Kriegel       <bgkriegel@gmail.com>
+Bernardo González Kriegel       <gonzalez@di.unc.edu.ar>
 
 # Name to name mapping: the name in the right column will be mapped to the name in the left
 
@@ -51,3 +54,5 @@ Jared Camins-Esakov             Jared CAMINS-ESAKOV
 <jcamins@cpbibliography.com>    <jcamins@bywatersolutions.com>
 <jcamins@cpbibliography.com>    <camins@numismatics.org>
 <jcamins@cpbibliography.com>    <koha@cpbibliography.com>
+<tcohen@psi.unc.edu.ar>         <tomascohen@gmail.com>
+<gonzalez@di.unc.edu.ar>        <bgkriegel@gmail.com>