diff --git a/.mailmap b/.mailmap
index cdfd9fda5e..27950476fe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,7 +13,8 @@
 <meyering@redhat.com> <jim@meyering.net>
 <socketpair@gmail.com> <socketpair gmail com>
 <soren@linux2go.dk> <soren@ubuntu.com>
-<jfehlig@novell.com> <jfehlig@linux-ypgk.site>
+<jfehlig@suse.com> <jfehlig@novell.com>
+<jfehlig@suse.com> <jfehlig@linux-ypgk.site>
 <jclift@redhat.com> <justin@salasaga.org>
 <berrange@redhat.com> <dan@berrange.com>
 <soren@linux2go.dk> <soren@canonical.com>
diff --git a/AUTHORS b/AUTHORS
index 6cf2cd5cd3..3dc34e9dc8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,7 +13,7 @@ The primary maintainers and people with commit access rights:
   Mark McLoughlin      <markmc@redhat.com>
   Anthony Liguori      <aliguori@us.ibm.com>
   Jim Meyering         <meyering@redhat.com>
-  Jim Fehlig           <jfehlig@novell.com>
+  Jim Fehlig           <jfehlig@suse.com>
   Chris Lalancette     <clalance@redhat.com>
   Cole Robinson        <crobinso@redhat.com>
   Guido Günther        <agx@sigxcpu.org>