diff --git a/.mailmap b/.mailmap
index 5d80e4aa082..18e55b0d1e7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@ Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
 Arash Esbati <arash@gnu.org> <esbati@gmx.de>
 Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
 Artur Malabarba <bruce.connor.am@gmail.com> Artur Malabarba <address@hidden>
+Basil L. Contovounesios <basil@contovou.net> <contovob@tcd.ie>
 Bastien Guerry <bzg@gnu.org>
 Bastien Guerry <bzg@gnu.org> <bastien1@free.fr>
 Bastien Guerry <bzg@gnu.org> <bzg@altern.org>
@@ -163,8 +164,8 @@ Ronnie Schnell <ronnie@driver-aces.com>
 Ryan C. Thompson <rct@thompsonclan.org>
 Sam Steingold <sds@gnu.org> <sdsg@amazon.com>
 Simen Heggestøyl <simenheg@runbox.com>
-Simen Heggestøyl <simenheg@runbox.com> <simenheg@ifi.uio.no>
 Simen Heggestøyl <simenheg@runbox.com> <simenheg@gmail.com>
+Simen Heggestøyl <simenheg@runbox.com> <simenheg@ifi.uio.no>
 Simon Josefsson <simon@josefsson.org> <jas@extundo.com>
 Stefan Kangas <stefankangas@gmail.com> <stefan@marxist.se>
 Stefan Monnier <monnier@iro.umontreal.ca> <monnier@IRO.UMontreal.CA>