diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..70bd2226
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Alexey Orlenko <eaglexrlnk@gmail.com>
+Dmitry Borisov <dimon.durak@gmail.com> <Dimon Durak>
+Mykola Bilochub <nbelochub@gmail.com>
+Timur Shemsedinov <timur.shemsedinov@gmail.com>
+Vlad Dziuba <dzyubavlad@gmail.com> <Dzyubavlad@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index c68926c1..5869cf4e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,6 @@
 Timur Shemsedinov <timur.shemsedinov@gmail.com>
+Dmitry Borisov <dimon.durak@gmail.com>
+Artem Chernenkiy <notthewhite@gmail.com>
 Alexey Orlenko <eaglexrlnk@gmail.com>
 Mykola Bilochub <nbelochub@gmail.com>
+Vlad Dziuba <dzyubavlad@gmail.com>