diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9512bf8..d4373ab 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,85 +1,95 @@
-Sorted in alphabetical order
-Open an issue or pull request if you don't want your name listed here.
+Sorted in alphabetical order. Feel free to open an issue or create a
+pull request if you want to change or remove your mention.
 
-Adam Jackson <ajax@nwnk.net>
-adelin-b <berard.adelin@gmail.com>
-Alexander Kapshuna <kapsh@kap.sh>
-Antonin Décimo <antonin.decimo@gmail.com>
-Antonio Vivace <dev@avivace.com>
-Avi-D-coder <avi.the.coder@gmail.com>
-Ben Friesen <bfriesen95@gmail.com>
-Bernd Busse <bernd@busse-net.de>
-Bert Gijsbers <gijsbers@science.uva.nl>
-bhagwan <bhagwan@disroot.org>
-Bodhi <craig.langman@gmail.com>
-Brottweiler <tibell.christoffer@gmail.com>
-Carl Worth <cworth@cworth.org>
-Christopher Jeffrey <chjjeffrey@gmail.com>
-Corax26 <cor.ax26@gmail.com>
-Dan Elkouby <streetwalkermc@gmail.com>
-Dana Jansens <danakj@orodu.net>
-Daniel Kwan <daniel.w.t.kwan@outlook.com>
-Dave Airlie <airlied@linux.ie>
+Adam Jackson <ajax at nwnk.net>
+adelin-b <berard.adelin at gmail.com>
+Alexander Kapshuna <kapsh at kap.sh>
+Antonin Décimo <antonin.decimo at gmail.com>
+Antonio Vivace <dev at avivace.com>
+Avi ד <avi.the.coder at gmail.com>
+Ben Friesen <bfriesen95 at gmail.com>
+Bernd Busse <bernd at busse-net.de>
+Bert Gijsbers <gijsbers at science.uva.nl>
+bhagwan <bhagwan at disroot.org>
+Bodhi <craig.langman at gmail.com>
+Brottweiler <tibell.christoffer at gmail.com>
+Carl Worth <cworth at cworth.org>
+Christopher Jeffrey <chjjeffrey at gmail.com>
+Corax26 <cor.ax26 at gmail.com>
+Dan Elkouby <streetwalkermc at gmail.com>
+Dana Jansens <danakj at orodu.net>
+Daniel Kwan <daniel.w.t.kwan at outlook.com>
+Dave Airlie <airlied at linux.ie>
 David Schlachter
 dolio
-Duncan <duncan.britton@outlook.com>
-Dylan Araps <dylan.araps@gmail.com>
-Einar Lielmanis <einars@gmail.com>
-Eric Anholt <anholt@freebsd.org> <eric@anholt.net>
+Duncan <duncan.britton at outlook.com>
+Dylan Araps <dylan.araps at gmail.com>
+Einar Lielmanis <einars at gmail.com>
+Eric Anholt <anholt at freebsd.org> <eric at anholt.net>
+Evgeniy Baskov <j-basevgser at yandex.ru>
 Greg Flynn
-Harish Rajagopal <harish.rajagopals@gmail.com>
-hasufell <julian.ospald@googlemail.com>
-Ignacio Taranto <ignacio.taranto@eclypsium.com>
+h7x4 <h7x4 at nani.wtf>
+Harish Rajagopal <harish.rajagopals at gmail.com>
+hasufell <julian.ospald at googlemail.com>
+i-c-u-p
+Ignacio Taranto <ignacio.taranto at eclypsium.com>
 Istvan Petres
-James Cloos <cloos@jhcloos.com>
-Jamey Sharp <jamey@minilop.net>
-Jan Beich <jbeich@FreeBSD.org>
-Jarrad <jarrad.whitaker@gmail.com>
-Javeed Shaikh <syscrash2k@gmail.com>
-Jerónimo Navarro <jnavarro@ancasrl.com.ar>
-jialeens <jialeadmin@163.com>
-Johnny Pribyl <pribylsnbits@gmail.com>
-Keith Packard <keithp@keithp.com>
-Kevin Kelley <kelleyk@kelleyk.net>
-ktprograms <ktprograms@gmail.com>
-Lukas Schmelzeisen <l.schmelzeisen@gmx.de>
-mæp <m.aep@live.com>
-Mark Tiefenbruck <mark@fluxbox.org>
-Matthew Allum <breakfast@10.am>
-Maxim Solovyov <visleaf@protonmail.com>
-Michael Reed <supertron421@gmail.com>
-Michele Lambertucci <michele.lambertucci@mail.polimi.it>
-Namkhai Bourquin <namkhai.n3@protonmail.com>
-Nate Hart <nejthan@gmail.com>
-nia <nia@netbsd.org>
-notfoss <static.vortex@gmx.com>
-Omar Polo <op@omarpolo.com>
-orbea <orbea@riseup.net>
-@Paradigm0001
+Jake <jakeroggenbuck2 at gmail.com>
+James Cloos <cloos at jhcloos.com>
+Jamey Sharp <jamey at minilop.net>
+Jan Beich <jbeich at freebsd.org>
+Jarrad <jarrad.whitaker at gmail.com>
+Javeed Shaikh <syscrash2k at gmail.com>
+Jerónimo Navarro <jnavarro at ancasrl.com.ar>
+jialeens <jialeadmin at 163.com>
+Johnny Pribyl <pribylsnbits at gmail.com>
+Keith Packard <keithp at keithp.com>
+Kevin Kelley <kelleyk at kelleyk.net>
+ktprograms <ktprograms at gmail.com>
+Kurenshe Nurdaulet
+Lukas Schmelzeisen <l.schmelzeisen at gmx.de>
+Mark Tiefenbruck <mark at fluxbox.org>
+Matthew Allum <breakfast at 10.am>
+Maxim Solovyov <msolovyov at protonmail.com>
+Michael Reed <supertron421 at gmail.com>
+Michele Lambertucci <michele.lambertucci at mail.polimi.it>
+mæp <m.aep at live.com>
+Namkhai Bourquin <namkhai.n3 at protonmail.com>
+Nate Hart <nejthan at gmail.com>
+nia <nia at netbsd.org>
+Nikolay Borodin <monsterovich at gmail.com>
+notfoss <static.vortex at gmx.com>
+Omar Polo <op at omarpolo.com>
+oofsauce <alanpanayotov at gmail.com>
+orbea <orbea at riseup.net>
+Paradigm0001
 Patrick Collins
-Peter Mattern <matternp@arcor.de>
-Phil Blundell <pb@reciva.com>
-Que Quotion <quequotion@bugmenot.com> <the_q123@hotmail.com>
-Rafael Kitover <rkitover@gmail.com>
-Richard Grenville <pyxlcy@gmail.com>
-Rytis Karpuska <rytis.karpuska@gmail.com>
-Samuel Hand <samuel.d.hand@gmail.com>
-Scott Leggett <scott@sl.id.au>
-scrouthtv <lennivh24@gmail.com>
-Sebastien Waegeneire <sebastien@waegeneire.com>
-Subhaditya Nath <sn03.general@gmail.com>
-Tasos Sahanidis <tasos@tasossah.com>
-Thiago Kenji Okada <thiagokokada@gmail.com>
-Tilman Sauerbeck <tilman@code-monkey.de>
-Tim van Dalen <Tim@timvdalen.nl>
-Tomas Janousek <tomi@nomi.cz>
-Tom Dörr <tomdoerr96@gmail.com>
+Peter Mattern <matternp at arcor.de>
+Phil Blundell <pb at reciva.com>
+Que Quotion <quequotion at bugmenot.com>
+Rafael Kitover <rkitover at gmail.com>
+Richard Grenville <pyxlcy at gmail.com>
+Rytis Karpuska <rytis.karpuska at gmail.com>
+Samuel Hand <samuel.d.hand at gmail.com>
+Scott Leggett <scott at sl.id.au>
+scrouthtv <lennivh24 at gmail.com>
+Sebastien Waegeneire <sebastien at waegeneire.com>
+Stefan Radziuk <stefan.radziuk19 at imperial.ac.uk>
+Subhaditya Nath <sn03.general at gmail.com>
+Tasos Sahanidis <tasos at tasossah.com>
+Thiago Kenji Okada <thiagokokada at gmail.com>
+Tilman Sauerbeck <tilman at code-monkey.de>
+Tim Siegel <siegeltr at gmail.com>
+Tim van Dalen <tim at timvdalen.nl>
+tokyoneon78 <mockcoder at protonmail.ch>
+Tom Dörr <tomdoerr96 at gmail.com>
+Tomas Janousek <tomi at nomi.cz>
 Toni Jarjour
-Tuomas Kinnunen <tuomas.kinnunen@aalto.fi>
-Uli Schlachter <psychon@znc.in>
-Walter Lapchynski <wxl@ubuntu.com>
-Will Dietz <w@wdtz.org>
-XeCycle <XeCycle@Gmail.com>
-Yuxuan Shui <yshuiv7@gmail.com>
+Tuomas Kinnunen <tuomas.kinnunen at aalto.fi>
+Uli Schlachter <psychon at znc.in>
+Walter Lapchynski <wxl at ubuntu.com>
+Will Dietz <w at wdtz.org>
+XeCycle <xecycle at gmail.com>
+Yuxuan Shui <yshuiv7 at gmail.com>
 zilrich
-ಠ_ಠ <easteregg@verfriemelt.org>
+ಠ_ಠ <easteregg at verfriemelt.org>