diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..0618d05
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+David Sedlák <xsedla1d@stud.fit.vutbr.cz>
+FredGan <ganshaolong@vip.qq.com>
+Juraj Vijtiuk <juraj.vijtiuk@sartura.hr> <vijtiuk.juraj@gmail.com> <30860583+jvijtiuk@users.noreply.github.com>
+Juraj Vijtiuk <juraj.vijtiuk@sartura.hr> <30860583+jvijtiuk@users.noreply.github.com>
+Michal Vasko <mvasko@cesnet.cz>
+Radek Krejci <rkrejci@cesnet.cz>