diff --git a/.mailmap b/.mailmap
index 1064df3b50..95c6553042 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,3 +37,8 @@ Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
 Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
 Piotr Osiewicz <piotr@zed.dev>
 Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
+Conrad Irwin <conrad@zed.dev>
+Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
+Thorsten Ball <thorsten@zed.dev>
+Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>
+Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>