diff --git a/.mailmap b/.mailmap
index fb35e30c6ab..3c4add7a23e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -168,12 +168,11 @@ Hui Qi Tay <hqtay@vmware.com> <tayhuiqithq@gmail.com>
 Ian Romanick <ian.d.romanick@intel.com> <idr@freedesktop.org>
 Ian Romanick <ian.d.romanick@intel.com> <idr@us.ibm.com>
 
-Jakob Bornecrantz <jakob@vmware.com> <jakob@vmware.com>
-Jakob Bornecrantz <jakob@vmware.com> <jakob@aurora.(none)>
-Jakob Bornecrantz <jakob@vmware.com> <jakob@aurora.walkyrie.se>
-Jakob Bornecrantz <jakob@vmware.com> <jakob@tungstengraphics.com>
-Jakob Bornecrantz <jakob@vmware.com> <wallbraker 'at' gmail 'dot' com>
-Jakob Bornecrantz <jakob@vmware.com> <wallbraker@gmail.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@vmware.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.(none)>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.walkyrie.se>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@tungstengraphics.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <wallbraker 'at' gmail 'dot' com>
 
 Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>