diff --git a/.mailmap b/.mailmap
index 89285586f..46317fbff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Stephen J Day <stephen.day@docker.com>  Stephen Day <stevvooe@users.noreply.github.com>
 Stephen J Day <stephen.day@docker.com>  Stephen Day <stevvooe@gmail.com>
 Olivier Gambier <olivier@docker.com>    Olivier Gambier <dmp42@users.noreply.github.com>
-Brian Bland <brian.bland@docker.com>    Brian Bland <r4nd0m1n4t0r@gmail.com>
\ No newline at end of file
+Brian Bland <brian.bland@docker.com>    Brian Bland <r4nd0m1n4t0r@gmail.com>
+Josh Hawn <josh.hawn@docker.com>        Josh Hawn <jlhawn@berkeley.edu>