diff --git a/.mailmap b/.mailmap
index bdab0fd8fc..4c40062fc2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -83,7 +83,7 @@ Atsushi Sakai <sakaia@jp.fujitsu.com>
 Takashi Natsume <natsume.takashi@lab.ntt.co.jp>
 Nakagawa Masaaki <nakagawamsa@nttdata.co.jp> nakagawamsa
 Romain Le Disez <romain.ledisez@ovh.net> Romain LE DISEZ
-Donagh McCabe <donagh.mccabe@hpe.com> <donagh.mccabe@hp.com>
+Donagh McCabe <donagh.mccabe@hpe.com> <donagh.mccabe@hp.com> <donagh.mccabe@gmail.com>
 Eamonn O'Toole <eamonn.otoole@hpe.com> <eamonn.otoole@hp.com>
 Gerry Drudy <gerry.drudy@hpe.com> <gerry.drudy@hp.com>
 Mark Seger <mark.seger@hpe.com> <mark.seger@hp.com>
@@ -113,5 +113,4 @@ Paul Dardeau <paul.dardeau@intel.com> <pauldardeau@gmail.com>
 Cheng Li <shcli@cn.ibm.com>
 Nandini Tata <nandini.tata@intel.com> <nandini.tata.15@gmail.com>
 Flavio Percoco <flaper87@gmail.com>
-Donagh McCabe <donagh.mccabe@hpe.com>
 Tin Lam <tinlam@gmail.com> <tl3438@att.com>
diff --git a/AUTHORS b/AUTHORS
index 26f8bffd6c..0eef542b6d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ Chmouel Boudjnah (chmouel@enovance.com)
 Florian Hines (syn@ronin.io)
 Greg Holt (gholt@rackspace.com)
 Paul Luse (paul.e.luse@intel.com)
+Donagh McCabe (donagh.mccabe@gmail.com)
 Jay Payne (letterj@gmail.com)
 Peter Portante (peter.portante@redhat.com)
 Will Reese (wreese@gmail.com)
@@ -108,7 +109,6 @@ Dirk Mueller (dirk@dmllr.de)
 Dmitriy Ukhlov (dukhlov@mirantis.com)
 Dmitry Ukov (dukov@mirantis.com)
 Dolph Mathews (dolph.mathews@gmail.com)
-Donagh McCabe (donagh.mccabe@hpe.com)
 Doron Chen (cdoron@il.ibm.com)
 Doug Hellmann (doug.hellmann@dreamhost.com)
 Doug Weimer (dweimer@gmail.com)