diff --git a/.mailmap b/.mailmap
index 5399c1c993..7e67800c26 100644
--- a/.mailmap
+++ b/.mailmap
@@ -52,3 +52,4 @@ Evgeny Grin <k2k@narod.ru>
 Peter Pih <railsnewbie257@gmail.com>
 Anton Malov <malov.anton@gmail.com>
 Marquis de Muesli <marquis.de.muesli@gmail.com>
+Kyohei Kadota <lufia@lufia.org>