diff --git a/.mailmap b/.mailmap
index 8c1eed3127..608780d54c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,3 +11,4 @@
 <socketpair@gmail.com> <socketpair gmail com>
 <soren@canonical.com> <soren@ubuntu.com>
 <jfehlig@novell.com> <jfehlig@linux-ypgk.site>
+<jclift@redhat.com> <justin@salasaga.org>
diff --git a/AUTHORS b/AUTHORS
index 222e1b7a41..aa1a1cfc22 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,7 +124,7 @@ Patches have also been contributed by:
   Thomas Treutner      <thomas@scripty.at>
   Jean-Baptiste Rouault <jean-baptiste.rouault@diateam.net>
   Марк Коренберг       <socketpair@gmail.com>
-  Justin Clift         <justin@salasaga.org>
+  Justin Clift         <jclift@redhat.com>
   Alan Pevec           <apevec@redhat.com>
 
   [....send patches to get your name here....]