diff --git a/.mailmap b/.mailmap
index ea89c8e96c1..df1b4d34998 100644
--- a/.mailmap
+++ b/.mailmap
@@ -356,6 +356,7 @@ Mitar Milutinovic <mitar.git@tnode.com>
 Mithun Sasidharan <mithunsasidharan89@gmail.com> <msasidharan@paypal.com>
 Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
 Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> <62040526+VoltrexMaster@users.noreply.github.com>
+MURAKAMI Masahiko <m-murakami@esm.co.jp> <fossamagna2@gmail.com>
 Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
 Myles Borins <myles.borins@gmail.com> <mylesborins@github.com>
 Myles Borins <myles.borins@gmail.com> <mylesborins@google.com>
@@ -538,6 +539,7 @@ Wyatt Preul <wpreul@gmail.com>
 Xavier J Ortiz <xavier.ortiz.ch@gmail.com>
 xiaoyu <306766053@qq.com>
 Xu Meng <dmabupt@gmail.com> <mengxumx@cn.ibm.com>
+Xuguang Mei <meixuguang@gmail.com> <meixg@foxmail.com>
 Yael Hermon <yaelherm@gmail.com> <yaelhe@wix.com>
 Yang Guo <yangguo@chromium.org>
 Yash Ladha <yash@yashladha.in> <18033231+yashLadha@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index 824588b8337..4628fece2ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1183,7 +1183,7 @@ ikasumi_wt <wtsnyk13@gmail.com>
 Yoshiya Hinosawa <stibium121@gmail.com>
 Syuhei Kobayashi <nanocloudx@gmail.com>
 YutamaKotaro <california.dreamin.never.die@gmail.com>
-MURAKAMI Masahiko <fossamagna2@gmail.com>
+MURAKAMI Masahiko <m-murakami@esm.co.jp>
 Thomas Watson <w@tson.dk>
 Daijiro Yamada <yamad@daiji.ro>
 Kelvin Jin <kelvinjin@google.com>
@@ -3414,7 +3414,7 @@ Tony Gorez <gorez.tony@gmail.com>
 ofirbarak <ofirbirka@gmail.com>
 Bar Admoni <bar6020677@gmail.com>
 ofir <ofir@cs.huji.ac.il>
-Xuguang Mei <meixg@foxmail.com>
+Xuguang Mei <meixuguang@gmail.com>
 Elad Nava <eladnava@gmail.com>
 Balakrishna Avulapati <bavulapati@gmail.com>
 Aaron Xie <xieqiang9408@gmail.com>