diff --git a/.mailmap b/.mailmap
index c8bab6dabbd..b881c47f6e5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 John Leeman <kd5wxb@gmail.com>
+John Leeman <kd5wxb@gmail.com> <john@leemangeophysical.com>
 <rmay@ucar.edu> <rmay31@gmail.com>
 <sarms@ucar.edu> <sarms@unidata.ucar.edu>
 Kevin Goebbert <kevin.goebbert@valpo.edu>
@@ -22,3 +23,4 @@ Steven Decker <sgdecker@envsci.rutgers.edu>
 <sgdecker@envsci.rutgers.edu> <decker@envsci.rutgers.edu>
 Claude Dicaire <31997745+eliteuser26@users.noreply.github.com>
 David Ahijevych <ahijevyc@ucar.edu>
+William Minchin <w_minchin@hotmail.com> MinchinWeb
\ No newline at end of file
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 04ddf99cd52..3e17b38662e 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,5 +1,4 @@
 The following are the contributors of code within MetPy:
-UCAR/Unidata
 Aaron Hill
 Abby Kenyon
 Alex Haberlie
@@ -18,19 +17,20 @@ Drew Camron
 Eric Bruning
 Joern Ungermann
 John Leeman
-John R. Leeman
 Jon Thielen
 Jonathan Helmus
 Joy Monteiro
 Kevin Goebbert
 Kishan Mehta
 Kristen Pozsonyi
-LProx2020
+kstilwell
 Leonardo Uieda
+LProx2020
 Lucas Sterzinger
 Matt Wilson
 Max Grover
 Michael James
+mmorello1
 Nathan Wendt
 Patrick Marsh
 Raul Mendez
@@ -41,13 +41,12 @@ Sean Arms
 Shawn Murdzek
 Stefan Hofer
 Steven Decker
-TJ Turnage
 Tim Supinie
+TJ Turnage
 Tyler Wixtrom
+UCAR/Unidata
 Vardan Nadkarni
 Warren Pettee
 Will Holmgren
 William Minchin
 Zach Bruick
-kstilwell
-mmorello1