diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..58e7d7952c0b98675a1128e306181f4aa1e0de3a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Oscar Gustafsson <oscar.gustafsson@liu.se> <oscar.gustafsson@gmail.com>
+Frans Skarman <frans.skarman@liu.se> <frans.skarman@protonmail.com>
+Mikael Henriksson <mikael.henriksson@liu.se> <mike.zx@hotmail.com>
+Andreas Bolin <andbo467@student.liu.se> <2535580+andbo467@users.noreply.github.com>