diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..edbd0fe88
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,46 @@
+Keesun Baik <keesun.baik@navercorp.com> <keesun.baik@navercorp.com>
+Keesun Baik <keesun.baik@navercorp.com> <whiteship@epril.com>
+Keesun Baik <keesun.baik@navercorp.com> <keesun.baik@nhn.com>
+
+Deokhong Kim <insane.hong@navercorp.com> <insane.hong@navercorp.com>
+Deokhong Kim <insane.hong@navercorp.com> <insanehong@navercorp.com>
+Deokhong Kim <insane.hong@navercorp.com> <insanehong@nhn.com>
+Deokhong Kim <insane.hong@navercorp.com> <insanehong@gmail.com>
+Deokhong Kim <insane.hong@navercorp.com> <intro957@gmail.com>
+
+Jihan Kim <kim.jihan@navercorp.com> <kim.jihan@navercorp.com>
+Jihan Kim <kim.jihan@navercorp.com> <laziel@navercorp.com>
+Jihan Kim <kim.jihan@navercorp.com> <laziel@nhn.com>
+Jihan Kim <kim.jihan@navercorp.com> <laziel@gmail.com>
+
+Yi EungJun <eungjun.yi@navercorp.com> <eungjun.yi@navercorp.com>
+Yi EungJun <eungjun.yi@navercorp.com> <semtlenori@gmail.com>
+Yi EungJun <eungjun.yi@navercorp.com> <nori@nhn.com>
+
+Changsung Kim <changsung.kim@navercorp.com> <changsung.kim@nhn.com>
+
+wansoon <alecsiel@naver.com> <alecsiel@gmail.com>
+wansoon <alecsiel@naver.com> <alecsiel@nhn.com>
+
+kjkmadness <kjkmadness@nhn.com> <kjkmadness@nhn.com>
+
+Yoon Kim <isyoon@gmail.com> <helolsajava@gmail.com>
+Yoon Kim <isyoon@gmail.com> <helolsjava@gmail.com>
+Yoon Kim <isyoon@gmail.com> <isyoonn@gmail.com>
+Yoon Kim <isyoon@gmail.com> <isyoon@comicpanda.com>
+
+Hwi Ahn <hwi.ahn@gmail.com> <byron1st@naver.com>
+Hwi Ahn <hwi.ahn@gmail.com> <hwi.ahn@gmail.com>
+
+Sangcheol Hwang <k16wire@nhn.com> <k16wire@gmail.com>
+Sangcheol Hwang <k16wire@nhn.com> <nhn@nhnui-MacBook-Pro.local>
+
+Ahn Hyeok Jun <qa22ahj@gmail.com> <bluemir@BlueMir.(none)>
+Ahn Hyeok Jun <qa22ahj@gmail.com> <qa22ahj@gmail.com>
+
+Suwon Chae <sw.chae@navercorp.com> <sw.chae@navercorp.com>
+Suwon Chae <sw.chae@navercorp.com> <doortts@gmail.com>
+Suwon Chae <sw.chae@navercorp.com> <sw.chae@nhn.com>
+
+HeeGu Lee <elf_hazard@nhn.com> <elf_hazard@nhn.com>
+HeeGu Lee <elf_hazard@nhn.com> <elfhazard@gmail.com>