diff --git a/.mailmap b/.mailmap
index 92e159e792..56aa57dc97 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,9 +42,11 @@ Bedo Khaled <bedokhaled66@gmail.com>
 Bedo Khaled <bedokhaled66@gmail.com> <64221784+abdelrahman725@users.noreply.github.com>
 BIKI DAS <bikid475@gmail.com>
 Brijmohan Siyag <brijsiyag@gmail.com>
-Brock Whittaker <brock@zulipchat.com> <bjwhitta@asu.edu>
-Brock Whittaker <brock@zulipchat.com> <brock@zulipchat.org>
-Brock Whittaker <brock@zulipchat.com> <brockwhittaker@Brocks-MacBook.local>
+Brock Whittaker <whittakerbrock@gmail.com> <bjwhitta@asu.edu>
+Brock Whittaker <whittakerbrock@gmail.com> <brock@zulip.com>
+Brock Whittaker <whittakerbrock@gmail.com> <brock@zulip.org>
+Brock Whittaker <whittakerbrock@gmail.com> <brock@zulipchat.org>
+Brock Whittaker <whittakerbrock@gmail.com> <brockwhittaker@Brocks-MacBook.local>
 Chris Bobbe <cbobbe@zulip.com> <cbobbe@zulipchat.com>
 Chris Bobbe <cbobbe@zulip.com> <csbobbe@gmail.com>
 codewithnick <nikhilsingh526452@gmail.com>
@@ -138,6 +140,7 @@ Tim Abbott <tabbott@zulip.com> <tabbott@dropbox.com>
 Tim Abbott <tabbott@zulip.com> <tabbott@humbughq.com>
 Tim Abbott <tabbott@zulip.com> <tabbott@mit.edu>
 Tim Abbott <tabbott@zulip.com> <tabbott@zulipchat.com>
+Tomasz Kolek <tomasz-kolek@o2.pl> <tomasz-kolek@go2.pl>
 Ujjawal Modi <umodi2003@gmail.com> <99073049+Ujjawal3@users.noreply.github.com>
 umkay <ukhan@zulipchat.com> <umaimah.k@gmail.com>
 umkay <ukhan@zulipchat.com> <umkay@users.noreply.github.com>