diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..be74214
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Parnic <parnic@parnic.com> Parnic <chris@parnic.com>
+rokiyo <rokiyo@example.com> Rokiyo <Rokiyo@example.com>