diff --git a/.mailmap b/.mailmap
index ded62585d9f..7f0a3fbfd70 100644
--- a/.mailmap
+++ b/.mailmap
@@ -133,8 +133,8 @@ David Miller <davem@davemloft.net> David S. Miller <davem@davemloft.net>
 David Miller <davem@davemloft.net> Dave Miller <davem@davemloft.net>
 David Miller <davem@davemloft.net> davem69 <davem69>
 
-David Heidelberger <david.heidelberger@ixit.cz> David Heidelberg <david@ixit.cz>
-David Heidelberger <david.heidelberger@ixit.cz> <d.okias@gmail.com>
+David Heidelberg <david@ixit.cz> David Heidelberger <david.heidelberger@ixit.cz>
+David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
 
 David Reveman <reveman@chromium.org> <c99drn@cs.umu.se>