diff --git a/CODE_OWNERS.TXT b/CODE_OWNERS.TXT
index d055bce2904..cc1a568032a 100644
--- a/CODE_OWNERS.TXT
+++ b/CODE_OWNERS.TXT
@@ -88,7 +88,7 @@ E: hfinkel@anl.gov
 D: The loop reroller, alias analysis and the PowerPC target
 
 N: Dan Gohman
-E: sunfish@mozilla.com
+E: llvm@sunfishcode.online
 D: WebAssembly Backend (lib/Target/WebAssembly/*)
 
 N: Renato Golin
diff --git a/CREDITS.TXT b/CREDITS.TXT
index 5b28c88f5ef..ec6f9216d18 100644
--- a/CREDITS.TXT
+++ b/CREDITS.TXT
@@ -163,7 +163,7 @@ E: foldr@codedgers.com
 D: Author of llvmc2
 
 N: Dan Gohman
-E: sunfish@mozilla.com
+E: llvm@sunfishcode.online
 D: Miscellaneous bug fixes
 D: WebAssembly Backend