diff --git a/.mailmap b/.mailmap
index 8f98ce5b..0e067c61 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,7 +13,8 @@ Alexandre Petitjean <alpetitjean@gmail.com>
 Alexandre Petitjean <alpetitjean@gmail.com> <alexandre.petitjean@lne.fr>
 Javier Domingo Cansino <javierdo1@gmail.com> <javier.domingo@fon.com>
 Lasse Bigum <lasse@bigum.org> <l.bigum@samsung.com>
-Nick Steel <kingosticks@gmail.com> <kingosticks@gmail.com>
+Nick Steel <nsteel@fastmail.com> <kingosticks@gmail.com>
+Nick Steel <nsteel@fastmail.com> <nickasteel@gmail.com>
 Janez Troha <janez.troha@gmail.com> <dz0ny@users.noreply.github.com>
 Janez Troha <janez.troha@gmail.com> <dz0ny@ubuntu.si>
 Luke Giuliani <luke@giuliani.com.au>
@@ -28,3 +29,14 @@ Kyle Heyne <kyleheyne@gmail.com>
 Tom Roth <rawdlite@googlemail.com>
 Eric Jahn <ejahn@newstore.com>
 Loïck Bonniot <git@lesterpig.com>
+Jens Lütjen <dublok@users.noreply.github.com>
+Jens Lütjen <dublok@users.noreply.github.com> <dublok@users.noreplay.github.com>
+Daniel T <thomas_d_j@yahoo.com.au>
+Ismael Asensio <ismailof@github.com>
+Brendan Jones <btjones711@gmail.com> <Btjones711@gmail.com>
+Marvin Preuss <marvin@xsteadfastx.org>
+Bernhard Gehl <bernhard.gehl@gmail.com>
+Caysho <caysho@internode.on.net> <mopidy-dev@mopidy-dev.mopidy-dev>
+Nick Aquina <nickaquina@gmail.com> <fantostisch@users.noreply.github.com>
+Jarryd Tilbrook <jrad.tilbrook@gmail.com>
+Matthieu Melquiond <matt.llvw@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 4cf69baa..ce6211fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,7 +16,7 @@
 - Jeremy B. Merrill <jeremybmerrill@gmail.com>
 - Adam Rigg <adam@adamrigg.id.au>
 - Ernst Bammer <herr.ernst@gmail.com>
-- Nick Steel <kingosticks@gmail.com>
+- Nick Steel <nsteel@fastmail.com>
 - Zan Dobersek <zandobersek@gmail.com>
 - Thomas Refis <refis.thomas@gmail.com>
 - Janez Troha <janez.troha@gmail.com>
@@ -77,3 +77,35 @@
 - Alex Malone <jalexmalone@gmail.com>
 - Daniel Hahler <git@thequod.de>
 - Bryan Bennett <bbenne10@gmail.com>
+- Jens Lütjen <dublok@users.noreply.github.com>
+- Lina He <linahe93@gmail.com>
+- Daniel T <thomas_d_j@yahoo.com.au>
+- Lars Kruse <devel@sumpfralle.de>
+- Benjamin Chrétien <chretien.b@gmail.com>
+- SeppSTA <s.staats@gmx.de>
+- Ismael Asensio <ismailof@github.com>
+- Tom Parker <palfrey@tevp.net>
+- Nantas Nardelli <nantas.nardelli@gmail.com>
+- Naglis Jonaitis <naglis@mailbox.org>
+- Alexander Jaworowski <alexander@jaworowski.se>
+- Don Armstrong <don@donarmstrong.com>
+- Nadav Tau <nadavt@sedonasys.com>
+- Aleksandar Benic <aleksandar.benic@protonmail.com>
+- Tom Swirly <tom@swirly.com>
+- Piotr Dobrowolski <Informatic@users.noreply.github.com>
+- Tomas Susanka <tsusanka@gmail.com>
+- James Barnsley <james@barnsley.nz>
+- Caysho <caysho@internode.on.net>
+- Brendan Jones <btjones711@gmail.com>
+- Marvin Preuss <marvin@xsteadfastx.org>
+- Bernhard Gehl <bernhard.gehl@gmail.com>
+- CL123123 <clairclair628@gmail.com>
+- Piotr Dobrowolski <admin@tastycode.pl>
+- Nick Aquina <nickaquina@gmail.com>
+- Marcus Götling <marcus@gotling.se>
+- Dominique Tardif <dommtardif@users.noreply.github.com>
+- Alexey Murz Korepov <murznn@gmail.com>
+- Jarryd Tilbrook <jrad.tilbrook@gmail.com>
+- Dan Brough <dan@danbrough.org>
+- Jonathan Jefferies <jjok@users.noreply.github.com>
+- Matthieu Melquiond <matt.llvw@gmail.com>