diff --git a/THANKS b/THANKS
index 0191224f..b6f3088b 100644
--- a/THANKS
+++ b/THANKS
@@ -3,241 +3,241 @@ Thanks
 ======
 
 Some people have helped more, some less, but nevertheless everyone's help
-has been important. :-) In alphabetical order:
-  - Mark Adler
-  - Victoria Alexia
-  - Kian-Meng Ang
-  - H. Peter Anvin
-  - Jeff Bastian
-  - Nelson H. F. Beebe
-  - Karl Beldan
-  - Karl Berry
-  - Anders F. Björklund
-  - Emmanuel Blot
-  - Melanie Blower
-  - Alexander Bluhm
-  - Martin Blumenstingl
-  - Ben Boeckel
-  - Jakub Bogusz
+has been important. :-)
   - Adam Borowski
-  - Maarten Bosmans
-  - Roel Bouckaert
-  - Lukas Braune
-  - Benjamin Buch
-  - Trent W. Buck
-  - Kevin R. Bulgrien
-  - James Buren
-  - David Burklund
-  - Frank Busse
-  - Daniel Mealha Cabrita
-  - Milo Casagrande
-  - Cristiano Ceglia
-  - Marek Černocký
-  - Tomer Chachamu
-  - Aziz Chaudhry
-  - Vitaly Chikunov
-  - Antoine Cœur
-  - Elijah Almeida Coimbra
-  - Felix Collin
-  - Ryan Colyer
-  - Marcus Comstedt
-  - Vincent Cruz
-  - Gabi Davar
-  - Ron Desmond
-  - Antonio Diaz Diaz
-  - İhsan Doğan
-  - Chris Donawa
-  - Andrew Dudman
-  - Markus Duft
-  - İsmail Dönmez
-  - Dexter Castor Döpping
-  - Paul Eggert
-  - Robert Elz
-  - Gilles Espinasse
-  - François Etcheverry
-  - Denis Excoffier
-  - Vincent Fazio
-  - Michael Felt
-  - Sean Fenian
-  - Michael Fox
-  - Andres Freund
-  - Mike Frysinger
-  - Collin Funk
-  - Daniel Richard G.
-  - Tomasz Gajc
-  - Bjarni Ingi Gislason
-  - John Paul Adrian Glaubitz
-  - Bill Glessner
-  - Matthew Good
-  - Michał Górny
-  - Jason Gorski
+  - Adam Walling
+  - Adrien Nader
+  - Agostino Sarubbo
+  - Alexander Bluhm
   - Alexander M. Greenham
-  - Juan Manuel Guerrero
-  - Gabriela Gutierrez
-  - Diederik de Haas
-  - Jan Terje Hansen
-  - Tobias Lahrmann Hansen
-  - Joachim Henke
-  - Lizandro Heredia
-  - Christian Hesse
+  - Alexander Neumann
+  - Alexandre Sauvé
+  - Alexey Tourbin
+  - Anders F. Björklund
+  - Andraž 'ruskie' Levstik
+  - Andre Noll
   - Andreas K. Hüttel
-  - Vincenzo Innocente
-  - Peter Ivanov
-  - Nicholas Jackson
-  - Sam James
+  - Andreas Schwab
+  - Andreas Zieringer
+  - Andrej Skenderija
+  - Andres Freund
+  - Andrew Dudman
+  - Andrew Murray
+  - Antoine Cœur
+  - Anton Kochkov
+  - Antonio Diaz Diaz
+  - Arkadiusz Miskiewicz
+  - Asgeir Storesund Nilsen
+  - Aziz Chaudhry
+  - Bela Lubkin
+  - Ben Boeckel
+  - Benjamin Buch
+  - Benno Schulenberg
+  - Bernhard Reutner-Fischer
+  - Bert Wesarg
+  - Bhargava Shastry
+  - Bill Glessner
+  - Bjarni Ingi Gislason
+  - Boud Roukema
+  - Brad Smith
+  - Bruce Stark
+  - Cary Lewis
+  - Charles Wilson
+  - Chenxi Mao
+  - Chien Wong
+  - Chris Donawa
+  - Chris McCrohan
+  - Christian Hesse
+  - Christian Kujau
+  - Christian von Roques
+  - Christian Weisgerber
+  - Christoph Junghans
+  - Collin Funk
+  - Conley Moorhous
+  - Cristian Rodríguez
+  - Cristiano Ceglia
+  - Dan Shechter
+  - Dan Stromberg
+  - Dan Weiss
+  - Daniel Leonard
+  - Daniel Mealha Cabrita
+  - Daniel Packard
+  - Daniel Richard G.
+  - David Burklund
+  - Denis Excoffier
+  - Derwin McGeary
+  - Dexter Castor Döpping
+  - Diederik de Haas
+  - Diego Elio Pettenò
+  - Dimitri Papadopoulos Orfanos
+  - Dirk Müller
+  - Douglas Thor
+  - Ed Maste
+  - Elbert Pol
+  - Eli Schwartz
+  - Elijah Almeida Coimbra
+  - Émilie Labbé
+  - Emmanuel Blot
+  - Eric Lindblad
+  - Eric S. Raymond
+  - Étienne Mollier
+  - Evan Nemerson
+  - Fangrui Song
+  - Felix Collin
+  - Filip Palian
+  - Firas Khalil Khana
+  - François Etcheverry
+  - Frank Busse
+  - Frank Prochnow
+  - Fredrik Wikstrom
+  - Gabi Davar
+  - Gabriela Gutierrez
+  - Gilles Espinasse
+  - Gregory Margo
+  - Guillaume Outters
+  - Guiorgy Potskhishvili
+  - H. Peter Anvin
   - Hajin Jang
   - Hans Jansen
-  - Jouk Jansen
-  - Jun I Jin
-  - Richard W.M. Jones
-  - Simon Josefsson
-  - Christoph Junghans
-  - Kiyoshi Kanazawa
-  - Joona Kannisto
-  - Per Øyvind Karlsen
-  - Firas Khalil Khana
-  - Iouri Kharon
-  - Kim Jinyeong
-  - Thomas Klausner
-  - Richard Koch
-  - Anton Kochkov
-  - Kirill A. Korinsky
   - Harri K. Koskinen
-  - Ville Koskinen
-  - Sergey Kosukhin
-  - Marcin Kowalczyk
-  - Jan Kratochvil
-  - Christian Kujau
-  - Stephan Kulow
-  - Ilya Kurdyukov
-  - Émilie Labbé
-  - Peter Lawler
-  - James M Leddy
-  - Kelvin Lee
-  - Vincent Lefevre
-  - Daniel Leonard
   - Hin-Tak Leung
-  - Andraž 'ruskie' Levstik
-  - Cary Lewis
+  - H.J. Lu
+  - Hongbo Ni
+  - Igor Pavlov
+  - İhsan Doğan
+  - Ilya Kurdyukov
+  - Iouri Kharon
+  - İsmail Dönmez
+  - Ivan A. Melnikov
+  - Jakub Bogusz
+  - James Buren
+  - James M Leddy
+  - Jan Kratochvil
+  - Jan Terje Hansen
+  - Jason Gorski
+  - Jeff Bastian
+  - Jeffrey Walton
+  - Jeroen Roovers
+  - Jim Meyering
+  - Jim Wilcoxson
+  - Joachim Henke
+  - John Paul Adrian Glaubitz
+  - Jonathan Nieder
+  - Jonathan Stott
+  - Joona Kannisto
+  - Jouk Jansen
+  - Juan Manuel Guerrero
+  - Jukka Salmi
+  - Julien Marrec
+  - Jun I Jin
+  - Kai Pastor
+  - Karl Beldan
+  - Karl Berry
+  - Keith Patton
+  - Kelvin Lee
+  - Kevin R. Bulgrien
+  - Kian-Meng Ang
+  - Kim Jinyeong
+  - Kirill A. Korinsky
+  - Kiyoshi Kanazawa
+  - Lars Wirzenius
+  - Lizandro Heredia
+  - Loganaden Velvindron
+  - Lorenzo De Liso
+  - Lukas Braune
+  - Maarten Bosmans
+  - Maksym Vatsyk
+  - Marcin Kowalczyk
+  - Marcus Comstedt
+  - Marcus Tillmanns
+  - Marek Černocký
+  - Mark Adler
+  - Mark Wielaard
+  - Markus Duft
+  - Markus Rickert
+  - Martin Blumenstingl
+  - Martin Matuška
+  - Martin Storsjö
+  - Martin Väth
+  - Mathieu Vachon
+  - Matthew Good
+  - Matthieu Rakotojaona
+  - Melanie Blower
+  - Michael Felt
+  - Michael Fox
+  - Michał Górny
+  - Mike Frysinger
+  - Mikko Pouru
+  - Milo Casagrande
+  - Mohammed Adnène Trojette
+  - Nathan Moinvaziri
+  - Nelson H. F. Beebe
+  - Nicholas Jackson
+  - Ole André Vadla Ravnås
+  - Orange Tsai
+  - Orgad Shaneh
+  - Patrick J. Volkerding
+  - Paul Eggert
+  - Paul Townsend
+  - Pavel Raiskup
+  - Per Øyvind Karlsen
+  - Peter Ivanov
+  - Peter Lawler
+  - Peter O'Gorman
+  - Peter Pallinger
+  - Peter Seiderer
+  - Pierre-Yves Martin
+  - Pilorz Wojciech
+  - Pippijn van Steenhoven
+  - Rafał Mużyło
+  - Rainer Müller
+  - Ralf Wildenhues
+  - Rich Prohaska
+  - Richard Koch
+  - Richard W.M. Jones
+  - Robert Elz
+  - Robert Readman
+  - Roel Bouckaert
+  - Ron Desmond
+  - Ruarí Ødegaard
+  - Rui Paulo
+  - Ryan Colyer
+  - Ryan Young
+  - Sam James
+  - Scott McAllister
+  - Sean Fenian
+  - Sebastian Andrzej Siewior
+  - Sergey Kosukhin
+  - Simon Josefsson
+  - Siteshwar Vashisht
+  - Steffen Nurpmeso
+  - Stephan Kulow
+  - Stephen Sachs
+  - Stuart Shelton
+  - Taiki Tsunekawa
+  - Thomas Klausner
+  - Tobias Lahrmann Hansen
+  - Tobias Stoeckmann
+  - Tomasz Gajc
+  - Tomer Chachamu
+  - Torsten Rupp
+  - Trần Ngọc Quân
+  - Trent W. Buck
+  - Victoria Alexia
+  - Vijay Sarvepalli
+  - Ville Koskinen
+  - Ville Skyttä
+  - Vincent Cruz
+  - Vincent Fazio
+  - Vincent Lefevre
+  - Vincent Torri
+  - Vincent Wixsom
+  - Vincenzo Innocente
+  - Vitaly Chikunov
   - Wim Lewis
+  - Xi Ruoyao
   - Xin Li
   - Yifeng Li
-  - Eric Lindblad
-  - Lorenzo De Liso
-  - H.J. Lu
-  - Bela Lubkin
-  - Chenxi Mao
-  - Gregory Margo
-  - Julien Marrec
-  - Pierre-Yves Martin
-  - Ed Maste
-  - Martin Matuška
-  - Scott McAllister
-  - Chris McCrohan
-  - Derwin McGeary
-  - Ivan A. Melnikov
-  - Jim Meyering
-  - Arkadiusz Miskiewicz
-  - Nathan Moinvaziri
-  - Étienne Mollier
-  - Conley Moorhous
-  - Dirk Müller
-  - Rainer Müller
-  - Andrew Murray
-  - Rafał Mużyło
-  - Adrien Nader
-  - Evan Nemerson
-  - Alexander Neumann
-  - Hongbo Ni
-  - Jonathan Nieder
-  - Asgeir Storesund Nilsen
-  - Andre Noll
-  - Steffen Nurpmeso
-  - Ruarí Ødegaard
-  - Peter O'Gorman
-  - Dimitri Papadopoulos Orfanos
-  - Guillaume Outters
-  - Daniel Packard
-  - Filip Palian
-  - Peter Pallinger
-  - Kai Pastor
-  - Keith Patton
-  - Rui Paulo
-  - Igor Pavlov
-  - Diego Elio Pettenò
-  - Elbert Pol
-  - Guiorgy Potskhishvili
-  - Mikko Pouru
-  - Frank Prochnow
-  - Rich Prohaska
-  - Trần Ngọc Quân
-  - Pavel Raiskup
-  - Matthieu Rakotojaona
-  - Ole André Vadla Ravnås
-  - Eric S. Raymond
-  - Robert Readman
-  - Bernhard Reutner-Fischer
-  - Markus Rickert
-  - Cristian Rodríguez
-  - Jeroen Roovers
-  - Christian von Roques
-  - Boud Roukema
-  - Torsten Rupp
-  - Stephen Sachs
-  - Jukka Salmi
-  - Agostino Sarubbo
-  - Vijay Sarvepalli
-  - Alexandre Sauvé
-  - Benno Schulenberg
-  - Andreas Schwab
-  - Eli Schwartz
-  - Peter Seiderer
-  - Orgad Shaneh
-  - Bhargava Shastry
-  - Dan Shechter
-  - Stuart Shelton
-  - Sebastian Andrzej Siewior
-  - Andrej Skenderija
-  - Ville Skyttä
-  - Brad Smith
-  - Fangrui Song
-  - Bruce Stark
-  - Pippijn van Steenhoven
-  - Tobias Stoeckmann
-  - Martin Storsjö
-  - Jonathan Stott
-  - Dan Stromberg
-  - Douglas Thor
-  - Marcus Tillmanns
-  - Vincent Torri
-  - Alexey Tourbin
-  - Paul Townsend
-  - Mohammed Adnène Trojette
-  - Orange Tsai
-  - Taiki Tsunekawa
-  - Mathieu Vachon
-  - Siteshwar Vashisht
-  - Maksym Vatsyk
-  - Loganaden Velvindron
-  - Patrick J. Volkerding
-  - Martin Väth
-  - Adam Walling
-  - Jeffrey Walton
-  - Christian Weisgerber
-  - Dan Weiss
-  - Bert Wesarg
-  - Mark Wielaard
-  - Fredrik Wikstrom
-  - Jim Wilcoxson
-  - Ralf Wildenhues
-  - Charles Wilson
-  - Lars Wirzenius
-  - Vincent Wixsom
-  - Pilorz Wojciech
-  - Chien Wong
-  - Xi Ruoyao
-  - Ryan Young
-  - Andreas Zieringer
   - 榆柳松 (ZhengSen Wang)
 
 Companies: