diff --git a/.mailmap b/.mailmap
index 63d292348..29f9ec039 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,7 +20,6 @@ Dustin Ingram       <di@di.codes>                           <di@users.noreply.gi
 Endoh Takanao                                               <djmchl@gmail.com>
 Erik M. Bray                                                <embray@stsci.edu>
 Gabriel de Perthuis                                         <g2p.code@gmail.com>
-Geoffrey Lehée                                              <geoffrey@lehee.name>
 Hsiaoming Yang                                              <lepture@me.com>
 Igor Kuzmitshov     <kuzmiigo@gmail.com>                    <igor@qubit.com>
 Ilya Baryshev                                               <baryshev@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 7ab324ce4..5b53db6c2 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -218,7 +218,6 @@ Gabriel Curio
 Gabriel de Perthuis
 Garry Polley
 gdanielson
-Geoffrey Lehée
 Geoffrey Sneddon
 George Song
 Georgi Valkov
@@ -551,6 +550,7 @@ Tony Zhaocheng Tan
 TonyBeswick
 toonarmycaptain
 Toshio Kuratomi
+toxinu
 Travis Swicegood
 Tzu-ping Chung
 Valentin Haenel