diff --git a/.mailmap b/.mailmap
index 6024c37419da0a486e9e85da82af20e2674024c8..5b4dfe5a84feb60e8b07118df1a299c7941b84f1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,3 +15,4 @@ Vincent Dubourg <vincent.dubourg@gmail.com> dubourg <vincent.dubourg@gmail.com>
 Vincent Dubourg <vincent.dubourg@gmail.com> dubourg <dubourg@PTlami14.(none)>
 Christian Osendorfer <osendorf@gmail.com> osdf <osendorf@gmail.com> 
 James Bergstra <james.bergstra@gmail.com> james.bergstra <james.bergstra@gmail.com>
+Xinfan Meng <mxf3306@gmail.com> mxf <mxf@chomsky.localdomain>
\ No newline at end of file
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
index 8855a992d4ac2aff8f84a6ffdc4c8415f4079cde..d8de63bfc533709b9d308334842a441bcfd9c2c5 100644
--- a/doc/whats_new.rst
+++ b/doc/whats_new.rst
@@ -65,7 +65,7 @@ Changelog
   - Allow input sequences of different lengths in :class:`hmm.GaussianHMM`
     [`Ron Weiss`_].
 
-  - Fix bug in affinity propagation caused by incorrect indexing [mxf]
+  - Fix bug in affinity propagation caused by incorrect indexing [Xinfan Meng]
 
 
 People
@@ -89,7 +89,7 @@ People that made this release possible preceeded by number of commits:
     - 1  Paolo Losi
     - 1  VirgileFritsch
     - 1  `Yaroslav Halchenko`_
-    - 1  mxf
+    - 1  Xinfan Meng
 
 
 .. _changes_0_6: