diff --git a/.mailmap b/.mailmap
index d8344641..a7a401ff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@ Matthias Kilian 	<kili@openbsd.org> kili <kili>
 Matthieu Herrb 		<matthieu@openbsd.org> matthieu <matthieu>
 Miod Vallat 		<miod@openbsd.org> miod <miod>
 Nicholas Marriott 	<nicm@openbsd.org> nicm <nicm>
+Nicholas Marriott 	<nicm@openbsd.org> no_author <no_author@example.org>
+<nicm@openbsd.org>	<nicholas.marriott@gmail.com>
 Okan Demirmen 		<okan@openbsd.org> okan <okan>
 Philip Guenther		<guenther@openbsd.org> guenther <guenther>
 Pierre-Yves Ritschard 	<pyr@openbsd.org> pyr <pyr>
@@ -18,4 +20,5 @@ Stefan Sperling 	<stsp@openbsd.org> stsp <stsp>
 Stuart Henderson 	<sthen@openbsd.org> sthen <sthen>
 Ted Unangst 		<tedu@openbsd.org> tedu <tedu>
 Theo Deraadt 		<deraadt@openbsd.org> deraadt <deraadt>
+Thomas Adam		<thomas@xteddy.org> Thomas <thomas@xteddy.org>
 William Yodlowsky 	<william@openbsd.org> william <william>