diff --git a/.mailmap b/.mailmap
index ab9f1912af..972c438733 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,3 +36,4 @@ Vishnu KS <yo@vishnuks.com> <yo@vishnuks.com>
 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>