diff --git a/.mailmap b/.mailmap
index a314fe408f0..2320600463c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -218,6 +218,8 @@ Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
 Ke Ding <dingkework@hotmail.com>
 Khaidi Chu <admin@xcoder.in> XadillaX <admin@xcoder.in>
 Khaidi Chu <admin@xcoder.in> <i@2333.moe>
+Kimberly Wilber <gcr@sneakygcr.net>
+Kimberly Wilber <gcr@sneakygcr.net> <gcr@users.noreply.github.com>
 Kiyoshi Nomo <tokyoincidents.g@gmail.com> kysnm <tokyoincidents.g@gmail.com>
 Koichi Kobayashi <koichik@improvement.jp>
 Kostiantyn Wandalen <wandalen.me@gmail.com>
@@ -255,7 +257,6 @@ Matthew Turner <matty_t47@hotmail.com> <ramesius@users.noreply.github.com>
 Maurice Hayward <mauricehayward1@gmail.com> maurice_hayward <mauricehayward1@gmail.com>
 Michael Bernstein <michaelrbernstein@gmail.com>
 Michael Dawson <michael_dawson@ca.ibm.com> <mdawson@devrus.com>
-Michael Wilber <gcr@sneakygcr.net>
 Michaël Zasso <targos@protonmail.com> <mic.besace@gmail.com>
 Michael-Rainabba Richardson <rainabba@gmail.com> rainabba <rainabba@gmail.com>
 Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index f1d2517b554..6d3ab499f82 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -141,7 +141,7 @@ Daniel Gröber <darklord@darkboxed.org>
 Travis Swicegood <development@domain51.com>
 Oleg Slobodskoi <oleg008@gmail.com>
 Jeremy Martin <jmar777@gmail.com>
-Michael Wilber <gcr@sneakygcr.net>
+Kimberly Wilber <gcr@sneakygcr.net>
 Sean Braithwaite <brapse@gmail.com>
 Anders Conbere <aconbere@gmail.com>
 Devin Torres <devin@devintorres.com>