diff --git a/.mailmap b/.mailmap
index 87096ec9..1488f1d9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,12 +1,15 @@
 Andrew Patterson <ajpatterson@lifesci.dundee.ac.uk> <workonly@qidane.com>
-Chris Allan <callan@glencoesoftware.com> <callan@blackcat.ca>
-Chris Allan <callan@glencoesoftware.com> <callan@lifesci.dundee.ac.uk>
-Curtis Rueden <ctrueden@wisc.edu> <unknown@unknown>
+Curtis Rueden <ctrueden@wisc.edu>
+David Pinto <david.pinto@bioch.ox.ac.uk> <carandraug+dev@gmail.com>
+Helen Flynn <h.flynn@dundee.ac.uk> <omehelen@gmail.com>
 Jean-Marie Burel <j.burel@dundee.ac.uk>
 Johannes Schindelin <johannes.schindelin@gmx.de> <Johannes.Schindelin@gmx.de>
-Josh Moore <josh@glencoesoftware.com> <josh.moore@gmx.de>
-Kristin Briney <briney@wisc.edu>
-Mark Hiner <hiner@wisc.edu> <hinerm@gmail.com>
+Josh Moore <josh@openmicroscopy.org> <josh.moore@gmx.de>
+Josh Moore <josh@openmicroscopy.org> <josh@glencoesoftware.com>
+Mark Carroll <m.t.b.carroll@dundee.ac.uk> <M.T.B.Carroll@Dundee.ac.uk>
 Melissa Linkert <melissa@glencoesoftware.com> <melissa.linkert@gmail.com>
-Premysl Fiala <premysl.fiala@lim.cz>
 Roger Leigh <r.leigh@dundee.ac.uk> <rleigh@debian.org>
+Roger Leigh <r.leigh@dundee.ac.uk> <rleigh@dundee.ac.uk>
+Roger Leigh <r.leigh@dundee.ac.uk> <rleigh@codelibre.net>
+Sébastien Besson <sbesson@glencoesoftware.com> <seb.besson@gmail.com>
+Simone Leo <s.z.leo@dundee.ac.uk> <simleo@crs4.it>