diff --git a/b_asic/.mailmap b/b_asic/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..567ec3188b2f5dcd555bce9d4760d4ca46a03aac
--- /dev/null
+++ b/b_asic/.mailmap
@@ -0,0 +1,2 @@
+Oscar Gustafsson <oscar.gustafsson@liu.se> <oscar.gustafsson@gmail.com>
+Andreas Bolin <andbo467@student.liu.se> <2535580+andbo467@users.noreply.github.com>