diff --git a/.mailmap b/.mailmap
index dacf44c7a..ea4a51281 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,5 @@ 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>
+Sam Dodrill <shadow.h511@gmail.com> <quora@lavabit.com>
+Sam Dodrill <shadow.h511@gmail.com> <quorawings@gmail.com>