diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..d8c3f594d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Stanislav Kinsbursky <skinsbursky@parallels.com> <skinsbursky@openvz.org>
+Pavel Emelyanov <xemul@parallels.com> <xemul@openvz.org>
+Andrey Vagin <avagin@parallels.com> <avagin@openvz.org>
+Andrey Vagin <avagin@parallels.com> <avagin@gmail.com>
+Andrey Vagin <avagin@parallels.com> Andrew Vagin <avagin@parallels.com>
+Cyrill Gorcunov <gorcunov@openvz.org> <gorcunov@gmail.com>