diff --git a/.mailmap b/.mailmap
index 97d73f9a68660a..bcff6c93d7e8e7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,6 +102,7 @@ Daniel Pihlström <sciolist.se@gmail.com>
 Daniel Wang <wangyang0123@gmail.com>
 Daniel Wang <wangyang0123@gmail.com> <wangyang02@baidu.com>
 Danielle Adams <adamzdanielle@gmail.com> <danielle.adams@heroku.com>
+Danny Guo <danny@dannyguo.com> <dannyguo91@gmail.com>
 Danny Nemer <hi@dannynemer.com> <DannyNemer@users.noreply.github.com>
 Danny Nemer <hi@dannynemer.com> <hi@DannyNemer.com>
 Darshan Sen <raisinten@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 097cb3dd193369..0532b0e9b941c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1084,7 +1084,7 @@ Rachel <rachel.black@flashtalking.com>
 Jason Ginchereau <jasongin@microsoft.com>
 Paul Kiddie <paul@paulkiddie.com>
 scott stern <scott.stern06@gmail.com>
-Danny Guo <dannyguo91@gmail.com>
+Danny Guo <danny@dannyguo.com>
 lrlna <shestak.irina@gmail.com>
 Matt Lang <matt@mediasuite.co.nz>
 Thomas van Lankveld <thomas@cell-0.com>
@@ -3092,7 +3092,6 @@ Frank Lemanschik <frank@github.dspeed.eu>
 Justice Almanzar <superdash993@gmail.com>
 Maksim Sinik <maksim@sinik.it>
 João Lucas Lucchetta <joao.lucas.lucchetta@gmail.com>
-Danny Guo <danny@dannyguo.com>
 Turner Jabbour <doubleujabbour@gmail.com>
 Igor Mikhalev <mr.igor.mikhalev@gmail.com>
 DeeDeeG <DeeDeeG@users.noreply.github.com>