diff --git a/.mailmap b/.mailmap
index b51aa26..b8b702f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,6 @@
 # See https://github.com/git/git/blob/master/Documentation/mailmap.txt
 # This file is sorted with:
-# (head -n3 .mailmap && tail -n+4 .mailmap | sort -i) > .mailmap.tmp && mv .mailmap.tmp .mailmap
+# (head -n3 .mailmap && tail -n+4 .mailmap | sort -f) > .mailmap.tmp && mv .mailmap.tmp .mailmap
 Adam D. Ruppe <destructionator@gmail.com>
 adil <adil@stockopedia.co.uk>
 adil <adil@stockopedia.co.uk> <adil@adil-ThinkCentre-A85>
@@ -18,6 +18,7 @@ Andrey Zherikov <andrey.zherikov@gmail.com>
 Brad Anderson <root>
 Brian Schott <briancschott@gmail.com>
 Brian Schott <briancschott@gmail.com> <Hackerpilot>
+Chalucha <chalucha@gmail.com>
 Christian Juelg <c.juelg@gmail.com>
 Clement Courbet <legrosbuffle@somebod.com> <clem@somebod.com>
 D8174 <michaelpm394@gmail.com>
@@ -25,6 +26,8 @@ Daniel Murphy <yebblies@gmail.com>
 Dave Gallets <davegallets@gmail.com>
 David <admin@dav1d.de> <admin@dav1d.de>
 David Herberth <admin@dav1d.de>
+David Simcha <dsimcha@gmail.com>
+David Simcha <dsimcha@gmail.com> <dsimcha@.(none)>
 Denis Shelomovskij <verylonglogin.reg@gmail.com>
 Dmitry Ds<ds.dlang@gmail.com>
 Don Clugston <dclugston@googlemail.com>
@@ -32,9 +35,9 @@ Don Clugston <dclugston@googlemail.com> <emailsdontbelong@inarepository.com>
 Ed McCardell <edmccard@hotmail.com>
 emstoudenmire <miles.stoudenmire@gmail.com>
 Hara Kenji <k.hara.pg+dev@gmail.com> <k.hara.pg@gmail.com>
+humdedum <humdedum@icloud.com>
 Héctor Barreras Almarcha <hbaelx@gmail.com>
 Héctor Barreras Almarcha <hbaelx@gmail.com> <Dechcaudron@users.noreply.github.com>
-humdedum <humdedum@icloud.com>
 Iain Buclaw <ibuclaw@gdcproject.org>
 Iain Buclaw <ibuclaw@gdcproject.org> <ibuclaw@HP-G62.(none)>
 Iain Buclaw <ibuclaw@gdcproject.org> ibuclaw <ibuclaw@ubuntu.com>
@@ -43,7 +46,9 @@ Ilya Yaroshenko <ilyayaroshenko@gmail.com>
 Jacob Carlborg <doob@me.com> <jacob.carlborg@gmail.com>
 Jakob Øvrum <jakobovrum@gmail.com>
 Jakob Øvrum <jakobovrum@gmail.com> <JakobOvrum@users.noreply.github.com>
+Jan Jurzitza <gh@webfreak.org>
 Jan Jurzitza <gh@webfreak.org> <janju007@web.de>
+Jan Jurzitza <gh@webfreak.org> <webfreak@archlinux.fritz.box>
 Joakim Noah <gh@joakim.fea.st>
 Joakim Noah <gh@joakim.fea.st> <git@joakim.fea.st>
 Joakim Noah <gh@joakim.fea.st> <joakim@airpost.net>
@@ -59,8 +64,8 @@ Lucia Mcojocaru <lucia.mcojocaru@gmail.com>
 Luís Marques <luis@luismarques.eu>
 Mark Barbone <30397247+mb64@users.noreply.github.com>
 Mark Barbone <30397247+mb64@users.noreply.github.com> Mark Barbone <>
-Martin Nowak <code@dawg.eu> <dawg@dawgfoto>
 Martin Nowak <code@dawg.eu> <dawg@dawgfoto.de>
+Martin Nowak <code@dawg.eu> <dawg@dawgfoto>
 Mathias Lang <mathias.lang@sociomantic.com> <geod24@gmail.com>
 Mathias Lang <mathias.lang@sociomantic.com> <mathias.lang@epitech.eu>
 Mathias Lang <mathias.lang@sociomantic.com> <pro.mathias.lang@gmail.com>
@@ -76,10 +81,6 @@ Nick Sabalausky <bus_github@semitwist.com>
 Nick Sabalausky <bus_github@semitwist.com> <Abscissa@users.noreply.github.com>
 Petar Kirov <petar.p.kirov@gmail.com> <petar.p.kirov@gmail.com>
 ponce <aliloko@gmail.com> <aliloko@gmail.com>
-Михаил Страшун <public@dicebot.lv>
-Михаил Страшун <public@dicebot.lv> <mihails.strasuns.contractor@sociomantic.com>
-Михаил Страшун <public@dicebot.lv> <m.strashun@gmail.com>
-Михаил Страшун <public@dicebot.lv> <registrations@dicebot.lv>
 Rainer Schuetze <r.sagitario@gmx.de> <r.sagitario@gmx.de>
 Razvan Nitu <razvan.nitu1305@gmail.com> <razvan.nitu1305@gmail.com>
 Robert burner Schadek <robert.schadek@informatik.uni-oldenburg.de> <rburners@gmail.com>
@@ -88,6 +89,7 @@ Ryan Roden-Corrent <ryan@rcorre.net>
 Safety0ff <safety0ff.dev@gmail.com>
 Safety0ff <safety0ff.dev@gmail.com> <safety0ff@users.sourceforge.net>
 shoo <zan77137@nifty.com> <zan77137@nifty.com>
+Sik <sik@PC-82.ik.local>
 Simen Kjærås <simen.kjaras@gmail.com>
 Simen Kjærås <simen.kjaras@gmail.com> <biotronic@biotronic.(none)>
 skkestrel <sudo@pt-get.com>
@@ -105,3 +107,7 @@ Wyatt <wyatt.epp@gmail.com>
 Yao Gómez <yao.gomez@gmail.com> <yaoltzin@gmail.com>
 yashikno <nobody@nowhere>
 Yazan Dabain <yazan.dabain@arabiaweather.com> <yazan.dabain@gmail.com>
+Михаил Страшун <public@dicebot.lv>
+Михаил Страшун <public@dicebot.lv> <m.strashun@gmail.com>
+Михаил Страшун <public@dicebot.lv> <mihails.strasuns.contractor@sociomantic.com>
+Михаил Страшун <public@dicebot.lv> <registrations@dicebot.lv>