diff --git a/.mailmap b/.mailmap
index c230dae2f..0b18e4179 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,7 +17,7 @@ Christoph Rönsch <christoph.roensch@arcor.de>
 Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net>
 Courtland Allen <courtlandallen@gmail.com>
 Dan Streetman <ddstreet@ieee.org>
-Dan Strohl <dstrohl@users.noreply.github.com>
+Dan Strohl <dan@wjcg.net> <dstrohl@users.noreply.github.com>
 Danny Trunk <dtrunk90@gmail.com> <dtrunk90@googlemail.com>
 David De Sloovere <david.desloovere@outlook.com> <david.desloovere@hotmail.com>
 David Murdoch <david@davidmurdoch.com> <musicisair@yahoo.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index d4bcd8efe..d4f0f4a78 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -321,8 +321,10 @@ Piotr Baran <piotros@wp.pl>
 Mukul Hase <mukulhase@gmail.com>
 Konstantin Dinev <kdinev@mail.bw.edu>
 Rand Scullard <rand@randscullard.com>
-Dan Strohl
+Dan Strohl <dan@wjcg.net>
 Maksim Ryzhikov <rv.maksim@gmail.com>
 Amine HADDAD <haddad@allegorie.tv>
 Amanpreet Singh <apsdehal@gmail.com>
 Alexey Balchunas <bleshik@gmail.com>
+Peter Kehl <peter.kehl@gmail.com>
+Peter Dave Hello <hsu@peterdavehello.org>
diff --git a/Gruntfile.js b/Gruntfile.js
index debcd6405..acbc84c8b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -432,9 +432,7 @@ grunt.registerTask( "update-authors", function() {
 		}
 
 		authors = authors.map(function( author ) {
-			if ( author.match( /^Dan Strohl </ ) ) {
-				return "Dan Strohl";
-			} else if ( author.match( /^Jacek Jędrzejewski </ ) ) {
+			if ( author.match( /^Jacek Jędrzejewski </ ) ) {
 				return "Jacek Jędrzejewski (http://jacek.jedrzejewski.name)";
 			} else if ( author.match( /^Pawel Maruszczyk </ ) ) {
 				return "Pawel Maruszczyk (http://hrabstwo.net)";