diff --git a/.mailmap b/.mailmap
index 56d5092686..720afaa967 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@
 <marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
 <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
 <neil@aldur.co.uk> <neil@brightbox.co.uk>
+<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
diff --git a/AUTHORS b/AUTHORS
index 19fac4281c..f6c2df45c5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -203,7 +203,6 @@ Patches have also been contributed by:
   Josh Durgin          <josh.durgin@dreamhost.com>
   Wen Ruo Lv           <lvroyce@linux.vnet.ibm.com>
   Patrice LACHANCE     <patlachance@gmail.com>
-  Stefan Berger        <stefanb@linux.vnet.ibm.com>
 
   [....send patches to get your name here....]