diff --git a/.mailmap b/.mailmap
index 9af6eb6afa..2d98623b27 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,3 +10,4 @@ Saúl Ibarra Corretgé <saghul@gmail.com>
 Yuki OKUMURA <mjt@cltn.org>
 Frank Denis <github@pureftpd.org>
 Ryan Emery <seebees@gmail.com>
+Yasuhiro Matsumoto <mattn.jp@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 56c20e77ef..6a95ce31f8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,3 +37,4 @@ Shimon Doodkin <helpmepro1@gmail.com>
 Ryan Emery <seebees@gmail.com>
 Bruce Mitchener <bruce.mitchener@gmail.com>
 Maciej Małecki <maciej.malecki@notimplemented.org>
+Yasuhiro Matsumoto <mattn.jp@gmail.com>