diff --git a/.mailmap b/.mailmap
index ecfcf97273..90448f04a2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,13 @@
-rworkman <rworkman@slackware.com>
-rworkman <rworkman@slackbuilds.org>
-erik <erik@slackbuilds.org>
-pprkut <pprkut@slackbuilds.org>
-michiel <michiel@slackbuilds.org>
-dsomero <xgizzmo@slackbuilds.org>
+Robby Workman <rworkman@slackware.com>
+Robby Workman <rworkman@slackbuilds.org>
+Erik Hanson <erik@slackbuilds.org>
+Rob McGee <rob0@slackbuilds.org>
+Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+Heinz Wiesinger <pprkut@slackbuilds.org>
+Dave Woodfall <dave@slackbuilds.org>
+Matteo Bernardini <ponce@slackbuilds.org>
+B. Watson <urchlay@slackbuilds.org>
+Andrew Clemons <aclemons@slackbuilds.org>
+David Spencer <idlemoor@slackbuilds.org>
+David Somero <xgizzmo@slackbuilds.org>
+Michiel van Wessem <michiel@slackbuilds.org>