diff --git a/.mailmap b/.mailmap
index e4596711ae955b..6582db8fce5287 100644
--- a/.mailmap
+++ b/.mailmap
@@ -92,6 +92,7 @@ Ray Morgan <rmorgan@zappos.com>
 Ray Solomon <raybsolomon@gmail.com>
 Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
 Rick Olson <technoweenie@gmail.com>
+Roman Klauke <romaaan.git@gmail.com> <romankl@users.noreply.github.com>
 Roman Reiss <me@silverwind.io>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index cd2b3aa983003f..c0134410842159 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -576,7 +576,7 @@ Rohini Harendra <rohini.raghav@gmail.com>
 Chris Barber <chris@cb1inc.com>
 Michael Kebe <michael.kebe@gmail.com>
 Nick Muerdter <stuff@nickm.org>
-Roman Klauke <romankl@users.noreply.github.com>
+Roman Klauke <romaaan.git@gmail.com>
 Xavi Magrinyà <xavi.mb89@gmail.com>
 Euan <euank@euank.com>
 Ed Morley <emorley@mozilla.com>
@@ -747,5 +747,9 @@ Peter Petrov <onestone@gmail.com>
 Andrew Crites <acrites@mobiquityinc.com>
 Marat Abdullin <dakota@brokenpipe.ru>
 Dan Varga <dvarga@redhat.com>
+Nick Raienko <enaqxx@gmail.com>
+Guilherme Souza <sitegui@sitegui.com.br>
+Chris Yip <i@chrisyip.im>
+Christopher Monsanto <chris@monsan.to>
 
 # Generated by tools/update-authors.sh