diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..666b6f6f5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+cora <coradelamouche@gmx.ch> cora <cora@noreply.git.minetest.land>
+Wuzzy <almikes@aol.com> Wuzzy <Wuzzy2@mail.ru>
+Elias Fleckenstein <eliasfleckenstein@web.de> Elias Fleckenstein <eliasfleckenstein03@noreply.git.minetest.land>
+epCode <epcode@noreply.git.minetest.land> epCode <eeliperry@gmail.com>
+PrairieWind <prairie.astronomer1@gmail.com> PrairieAstronomer <prairie.astronomer1@gmail.com>
+PrairieWind <prairie.astronomer1@gmail.com> PrairieWind <prairieastronomer@noreply.git.minetest.land>
+kay27 <kay27@bk.ru> kay27 <kay27@noreply.git.minetest.land>
+AFCMS <afcm.contact@gmail.com> AFCMS <afcms@noreply.git.minetest.land>