diff --git a/.mailmap b/.mailmap
index e59294058..2d608f95f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,4 @@
 San-Tai Hsu <vanilla@fatpipi.com>
 Isaac Z. Schlueter <i@izs.me>
 Saúl Ibarra Corretgé <saghul@gmail.com>
+Yuki OKUMURA <mjt@cltn.org>
diff --git a/AUTHORS b/AUTHORS
index 00512c46c..0b852b12c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,3 +27,5 @@ Pieter Noordhuis <pcnoordhuis@gmail.com>
 Marek Jelen <marek@jelen.biz>
 Fedor Indutny <fedor.indutny@gmail.com>
 Saúl Ibarra Corretgé <saghul@gmail.com>
+Felix Geisendörfer <felix@debuggable.com>
+Yuki OKUMURA <mjt@cltn.org>