diff --git a/.mailmap b/.mailmap
index f8cc0f617e3..9a4876eb0b3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -49,4 +49,5 @@ Renato Aguiar <renato@renatoaguiar.net> Renato Aguiar <renato@aguiar.info>
 Đoàn Trần Công Danh <congdanhqx@gmail.com> <congdanhqx+sgn@gmail.com>
 Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh <congdanhqx@gmail.com>
 John <me@johnnynator.dev> John <johnz@posteo.net>
+John <me@johnnynator.dev> John Zimmermann <johnz@posteo.net>
 Daniel Kolesa <daniel@octaforge.org> q66 <daniel@octaforge.org>