diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..9d9a82a4c
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Mitchell Hashimoto <m@mitchellh.com> <mitchell.hashimoto@gmail.com>
+Gregory Anders <greg@gpanders.com> <8965202+gpanders@users.noreply.github.com>
+Jeffrey C. Ollie <jeff@ocjtech.us> <jcollie@dmacc.edu>
+Kevin Hovsäter <kevin@hovsater.com> <kevin@hovsater.com>
+Nathan Fisher <nfisher.sr@gmail.com> <jeang3nie@hitchhiker-linux.org>
+Paul Berg <naydex.mc@gmail.com> <9824244+Pangoraw@users.noreply.github.com>
+RGBCube <git@rgbcu.be> <RGBCube@users.noreply.github.com>
+RGBCube <git@rgbcu.be> <78925721+RGBCube@users.noreply.github.com>