diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..2d6536791b3
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Timo Teräs <timo.teras@iki.fi>
+Natanael Copa <ncopa@alpinelinux.org> <natanael.copa@gmail.com>
+Natanael Copa <ncopa@alpinelinux.org> <ncopa@ncopa-laptop.localdomain>
+Natanael Copa <ncopa@alpinelinux.org> <ncopa@alpine-netbook.(none)>