diff --git a/.mailmap b/.mailmap
index 60b8e213f8..a66bfe2022 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,6 +13,8 @@ Greg Price <greg@zulip.com> <greg@zulipchat.com>
 Greg Price <greg@zulip.com> <price@mit.edu>
 Jessica McKellar <jesstess@mit.edu> <jesstess@humbughq.com>
 Jessica McKellar <jesstess@mit.edu> <jesstess@zulip.com>
+Kevin Mehall <km@kevinmehall.net> <kevin@humbughq.com>
+Kevin Mehall <km@kevinmehall.net> <kevin@zulip.com>
 Ray Kraesig <rkraesig@zulip.com> <rkraesig@zulipchat.com>
 Rishi Gupta <rishig@zulipchat.com> <rishig+git@mit.edu>
 Rishi Gupta <rishig@zulipchat.com> <rishig@kandralabs.com>
@@ -35,5 +37,4 @@ Vishnu KS <yo@vishnuks.com> <yo@vishnuks.com>
 # are no multiple entries in /team page.
 Allen Rabinovich <allenr@zulip.com> <allenr@humbughq.com>
 Jeff Arnold <jbarnold@zulip.com> <jbarnold@humbughq.com>
-Kevin Mehall <kevin@zulip.com> <kevin@humbughq.com>
 Scott Feeney <scott@zulip.com> <scott@humbughq.com>