diff --git a/.mailmap b/.mailmap
index fd40c917..da57466f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,4 +19,5 @@ Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
 Stephen Hemminger <stephen@networkplumber.org> <osdl.org!shemminger>
 Stephen Hemminger <stephen@networkplumber.org> <osdl.net!shemminger>
 
-David Ahern <dsahern@gmail.com> <dsa@cumulusnetworks.com>
+David Ahern <dsahern@kernel.org> <dsahern@gmail.com>
+David Ahern <dsahern@kernel.org> <dsa@cumulusnetworks.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 82043c1b..c2daf2b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21,7 +21,7 @@ T: git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
 L: netdev@vger.kernel.org
 
 Next Tree
-M: David Ahern <dsahern@gmail.com>
+M: David Ahern <dsahern@kernel.org>
 T: git://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git
 L: netdev@vger.kernel.org
 
diff --git a/README b/README
index a7d283cb..6ddf6015 100644
--- a/README
+++ b/README
@@ -52,4 +52,4 @@ Stephen Hemminger
 stephen@networkplumber.org
 
 David Ahern
-dsahern@gmail.com
+dsahern@kernel.org