diff --git a/.mailmap b/.mailmap
index a9b07251..847494ba 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Bob Beck		<beck@openbsd.org> beck <beck>
+Claudio Jeker           <claudio@openbsd.org> claudio <claudio>
 Igor Sobrado		<sobrado@openbsd.org> sobrado <sobrado>
 Ingo Schwarze		<schwarze@openbsd.org> schwarze <schwarze>
 Jacek Masiulaniec	<jacekm@openbsd.org> jacekm <jacekm>
@@ -29,6 +30,7 @@ Theo de Raadt		<deraadt@openbsd.org> Theo Deraadt <deraadt@openbsd.org>
 Thomas Adam		<thomas@xteddy.org> Thomas <thomas@xteddy.org>
 Thomas Adam		<thomas@xteddy.org> n6tadam <n6tadam@xteddy.org>
 Thomas Adam		<thomas@xteddy.org> Thomas Adam <thomas.adam@smoothwall.net>
+Tim van der Molen       <tim@openbsd.org> tim <tim>
 Tobias Stoeckmann	<tobias@openbsd.org> tobias <tobias>
 Todd C Miller		<millert@openbsd.org> millert <millert>
 William Yodlowsky	<william@openbsd.org> william <william>