diff --git a/.mailmap b/.mailmap
index 809044cb41e..d5bd0a0538e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -250,7 +250,8 @@ Jackmcbarn <jackmcbarn@gmail.com>
 Jackmcbarn <jackmcbarn@gmail.com> <jackmcbarn@users.noreply.github.com>
 jagori <jagori79@gmail.com>
 James D. Forrester <jforrester@wikimedia.org>
-Jdrewniak <jan.drewniak@gmail.com>
+Jan Drewniak <jdrewniak@wikimedia.org>
+Jan Drewniak <jdrewniak@wikimedia.org> <jan.drewniak@gmail.com>
 Jaime Crespo <jcrespo@wikimedia.org>
 Jan Gerber <j@thing.net> <j@users.mediawiki.org>
 Jan Luca Naumann <jan@jans-seite.de>
@@ -557,6 +558,7 @@ Vikas S Yaligar <vikasyaligar.it@gmail.com>
 Vinitha <vinithacse@gmail.com>
 Vivek Ghaisas <v.a.ghaisas@gmail.com>
 Volker E <volker.e@wikimedia.org>
+Wendy Quarshie <wquarshie@wikimedia.org>
 wctaiwan <wctaiwan@gmail.com>
 withoutaname <drevitchi@gmail.com>
 X! <soxred93@gmail.com> <soxred93@users.mediawiki.org>
diff --git a/CREDITS b/CREDITS
index b30a4d479e7..7122428177d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1037,7 +1037,6 @@ The following list can be found parsed under Special:Version/Credits -->
 * Winston Sung
 * withoutaname
 * WMDE-Fisch
-* wquarshie
 * X!
 * Xabriel J. Collazo Mojica
 * xiplus