diff --git a/.mailmap b/.mailmap
index 9f05cae..afc8350 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,19 +2,19 @@ Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com>
 Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com> <abigail.cabunoc@oicr.on.ca>
 Alexander Konovalov <alexander.konovalov@st-andrews.ac.uk> <alex-konovalov@users.noreply.github.com>
 Amy Brown <amyrhoda@gmail.com> <arbrown@latte.ca>
-Andy Boughton <abought@gmail.com> <pchemist@gmail.com>
 Ariel Rokem <arokem@gmail.com>
-Ashwin Srinath <ashwinsrnth@gmail.com> <atrikut@clemson.edu>
+Bartosz Telenczuk <bartosz@telenczuk.pl>
+Erin Becker <erinstellabecker@gmail.com>
 Evan P. Williamson <evanpeterw@gmail.com>
 François Michonneau <francois.michonneau@gmail.com>
-François Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
 Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
 Ivan Gonzalez <iglpdc@gmail.com> <iglpdc@users.noreply.github.com>
 James Allen <james@sharelatex.com> <jamesallen0108@gmail.com>
-Kate Hertweck <k8hertweck@gmail.com>
+Maxim Belkin <maxim.belkin@gmail.com> <maxim-belkin@users.noreply.github.com>
 Mike Jackson <m.jackson@software.ac.uk> <michaelj@epcc.ed.ac.uk>
 Raniere Silva <raniere@rgaiacs.com> <ra092767@ime.unicamp.br>
 Raniere Silva <raniere@rgaiacs.com> <raniere@ime.unicamp.br>
 Rémi Emonet <remi@heeere.com> <remi.emonet@reverse--com.heeere>
 Rémi Emonet <remi@heeere.com> <twitwi@users.noreply.github.com>
 Timothée Poisot <t.poisot@gmail.com> <tim@poisotlab.io>
+Valentina Staneva <val_is_everywhere@yahoo.com> <valentina-s@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index 7be5668..2d65faa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,20 +3,15 @@ Pete Bachant
 Piotr Banaszkiewicz
 David Beitey
 Trevor Bekolay
-Maxim Belkin
 John Blischak
 Andy Boughton
 Amy Brown
 C. Titus Brown
-Abigail Cabunoc Mayes
 Gerard Capes
-Ian Carroll
-Gabriel A. Devenyi
 Jonah Duckles
 Rémi Emonet
 Ivan Gonzalez
 Thomas Guignard
-Michael Hansen
 Kate Hertweck
 Mike Jackson
 W. Trevor King
@@ -26,16 +21,13 @@ François Michonneau
 Bill Mills
 Aaron O'Leary
 Bianca Peterson
-Jon Pipitone
 Timothée Poisot
 Florian Rathgeber
 Ariel Rokem
 Raniere Silva
-Ashwin Srinath
 Valentina Staneva
 Tracy Teal
-Evan P. Williamson
-Carol Willing
 Greg Wilson
 Donny Winston
 Naupaka Zimmerman
+Bartosz Telenczuk