diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..de33e99
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Alex Lockwood <thealexlockwood@sky.com>
+Alex Lockwood <thealexlockwood@sky.com> <al6g17@soton.ac.uk>
+Andrew Barrett-Sprot <abarrettsprot@gmail.com> <Adimote@users.noreply.github.com>
+Dan Trickey <dan@trickey.io> <trickeydan@users.noreply.github.com>
+Jake Howard <jhoward@sourcebots.co.uk> <git@theorangeone.net>
+Jake Howard <jhoward@sourcebots.co.uk> <RealOrangeOne@users.noreply.github.com>
+Peter Law <PeterJCLaw@gmail.com>