diff --git a/.mailmap b/.mailmap
index 4105b5f80f4c60db5aa4e276699baa38f96e1880..a90952727bc8d1453f3aaa39e02a27d1365517f7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -246,6 +246,7 @@ Morten Welinder <welinder@anemone.rentec.com>
 Morten Welinder <welinder@darter.rentec.com>
 Morten Welinder <welinder@troll.com>
 Mythri P K <mythripk@ti.com>
+Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
 Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
 Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
diff --git a/MAINTAINERS b/MAINTAINERS
index 2a0737dfca89b48742b85c6da8c0322fe78fe9df..667d03852191fbbcb6827eaa7bdbd9bbfc8c0a4f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4304,7 +4304,7 @@ S:	Maintained
 F:	.clang-format
 
 CLANG/LLVM BUILD SUPPORT
-M:	Nathan Chancellor <natechancellor@gmail.com>
+M:	Nathan Chancellor <nathan@kernel.org>
 M:	Nick Desaulniers <ndesaulniers@google.com>
 L:	clang-built-linux@googlegroups.com
 S:	Supported