diff --git a/.mailmap b/.mailmap
index d0d3e26606d..45c0a48b350 100644
--- a/.mailmap
+++ b/.mailmap
@@ -74,6 +74,8 @@ Jim Burton                  <jim@sdf-eu.org>
 Joe Quinn                   <headprogrammingczar@gmail.com>
 Joel Stanley                <intractable@gmail.com>
 Joeri van Eekelen           <tchakkazulu@gmail.com>
+John Ericson                <Ericson2314@yahoo.com>                <Ericson2314@Yahoo.con>
+John Ericson                <Ericson2314@yahoo.com>                <jericson@galois.com>
 John D. Ramsdell            <ramsdell@mitre.org>
 John Dias                   <dias@eecs.harvard.edu>                dias <dias@eecs.harvard.edu>
 Josh Hoyt                   <josh.hoyt@galois.com>
@@ -101,6 +103,8 @@ Peter Simons                <simons@cryp.to>
 Peter Trško                 <peter.trsko@gmail.com>                Peter Trsko <peter.trsko@ixperta.com>
 Philipp Schuster            <pschuster@uni-koblenz.de>
 Randy Polen                 <randen@users.noreply.github.com>
+Robert Henderson            <rob@robjhen.com>                      <robjhen@users.noreply.github.com>
+Robert Henderson            <rob@robjhen.com>                      <rob at robjhen dot com>
 Ryan Scott                  <ryan.gl.scott@gmail.com>              <ryan.gl.scott@ku.edu>
 Samuel Gélineau             <gelisam+github@gmail.com>
 Sergei Trofimovich          <slyfox@community.haskell.org>         <slyfox@gentoo.org>
diff --git a/AUTHORS b/AUTHORS
index 4808f93f573..3169a36972a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -222,6 +222,7 @@ Reid Barton              <rwbarton@gmail.com>
 Richard Eisenberg        <eir@cis.upenn.edu>
 Ricky Elrod              <ricky@elrod.me>
 Robert Collins           <robertc@robertcollins.net>
+Robert Henderson         <rob@robjhen.com>
 Roberto Zunino           <zunrob@users.sf.net>
 Robin Green              <greenrd@greenrd.org>
 Robin KAY                <komadori@gekkou.co.uk>