diff --git a/.mailmap b/.mailmap
index 96127c8694f..0baad02a61f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -546,6 +546,9 @@ Sonny Jiang <sonny.jiang@amd.com>
 
 Stefan Brüns <stefan.bruens@rwth-aachen.de> <Stefan.Bruens@rwth-aachen.de>
 
+Steinar H. Gunderson <sgunderson@bigfoot.com> <sesse@google.com>
+Steinar H. Gunderson <sgunderson@bigfoot.com> <steinar+mesa@gunderson.no>
+
 Stéphane Marchesin <marcheu@chromium.org> Stephane Marchesin <marchesin@icps.u-strasbg.fr>
 Stéphane Marchesin <marcheu@chromium.org> Stephane Marchesin <stephane.marchesin@gmail.com>