diff --git a/.mailmap b/.mailmap
index c296aa04a..d9a6e1a9c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,3 +35,8 @@ Jason Juang <jasjuang@gmail.com>
 Carlo Teubner <carlo.teubner@gmail.com>
 Joel Depooter <joel.depooter@safe.com>
 Sebastian Mundry <mundry@outlook.com>
+Rainer Canavan <rainer.canavan@sevenval.com> <canavan@users.noreply.github.com>
+Dan Fandrich <dan@coneharvesters.com>
+Henrik S. Gaßmann <henrik@gassmann.onl>
+Jiří Malák <malak.jiri@gmail.com>
+Nick Zitzmann <nickzman@gmail.com>
diff --git a/docs/THANKS b/docs/THANKS
index 339580d97..58dd67d3d 100644
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -1658,7 +1658,6 @@ arainchik on github
 asavah on github
 baumanj on github
 bsammon on github
-canavan on github
 cbartl on github
 cmfrolick on github
 destman on github