diff --git a/.mailmap b/.mailmap
index 45686d39538..5f95c49dcec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -252,6 +252,7 @@ Michael Monreal <michael.monreal@gmail.com>
 Michael Roitzsch <reactorcontrol@icloud.com>
 michag86 <micha_g@arcor.de>
 Michiel de Jong <michiel@unhosted.org> Michiel@unhosted <michiel@unhosted.org>
+Micke Nordin <kano@sunet.se> Mikael Nordin <mickenordin@users.noreply.github.com>
 Miguel Prokop <miguel.prokop@vtu.com>
 miicha <pfitzner@physik.hu-berlin.de>
 Miquel Rodríguez Telep / Michael Rodríguez-Torrent <miquel@designunbound.co.uk>
diff --git a/AUTHORS b/AUTHORS
index 8881c9ba26a..fe478401fdd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -338,7 +338,6 @@
  - Mickey Knox <mickey@netfreaks.org>
  - Miguel Prokop <miguel.prokop@vtu.com>
  - Mikael Hammarin <mikael@try2.se>
- - Mikael Nordin <mickenordin@users.noreply.github.com>
  - Mikael Saarinen <mikaels@iki.fi>
  - Mikhail Sazanov <m@sazanof.ru>
  - Mitar <mitar.git@tnode.com>