diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..3b5491c9f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,17 @@
+Aaron Sethman <androsyn@ratbox.org> androsyn <devnull@localhost>
+Alexander Færøy <ahf@0x90.dk> Alexander F?r?y <ahf@0x90.dk>
+Brett Greenham <taros@shadowircd.net> B.Greenham <taros@shadowircd.net>
+Chris Mills <chris@chrisam.net> TheChrisAM <chris@chrisam.net>
+Chris Mills <chris@chrisam.net> freenode!ChrisAM <chris@chrisam.net>
+Elizabeth Jennifer Myers <elizabeth@sporksmoo.net> <elizabeth@sporksirc.net>
+Elly Fong-Jones <elly@leptoquark.net> Elly <elly@leptoquark.net>
+Jilles Tjoelker <jilles@stack.nl> jilles <devnull@localhost>
+Nathan Phillip Brink <binki@gentoo.org> <ohnobinki@ohnopublishing.net>
+Stephen Bennett <spb@exherbo.org> <stephen@freenode.net>
+Valeriy Yatsko <dwr@shadowircd.net> <darkwire.tl@gmail.com>
+Valeriy Yatsko <dwr@shadowircd.net> <darkwire@darkwire.ru>
+Valeriy Yatsko <dwr@shadowircd.net> <darkwire@ircd-charybdis.ru>
+Valeriy Yatsko <dwr@shadowircd.net> <darkwire@sellcenter.ru>
+Valeriy Yatsko <dwr@shadowircd.net> <dwr@it-penza.org>
+William Pitcock <nenolod@dereferenced.org> <nenolod@atheme.org>
+William Pitcock <nenolod@dereferenced.org> nenolod <devnull@localhost>