diff --git a/AUTHORS b/AUTHORS
index 36ffdcdab..e9ae34dcf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,25 +1,47 @@
 # MAINTAINER
 
-Teo Mrnjavac <teo@kde.org> (maintainer -2017)
-Adriaan de Groot <groot@kde.org> (maintainer 2017-)
+Calamares development is sponsored by Blue Systems GmbH - Liberating Software.
+
+Calamares maintainers through the years:
+ * Teo Mrnjavac <teo@kde.org> (maintainer -2017)
+ * Adriaan de Groot <groot@kde.org> (maintainer 2017-)
 
 # CONTRIBUTORS
 
-Alf Gaida
-Allen Welkie
-Andrius Štikonas
-Bernhard Landauer
-Bezzy1999
-bill-auger
-Caio Jordão Carvalho
-crispg72
-demmm
-Gabriel Craciunescu
-Kai Dohmen
-Kevin Kofler
-Kyle Robertze
-Lisa Vitolo
-n3rdopolis
-Philip Müller
-Ramon Buldó
-Rohan Garg
+Calamares has received contributions of code, documentation, artwork
+and moral support from (alphabetically by first name or nickname):
+
+ - Alf Gaida
+ - aliveafter1000
+ - Allen Welkie
+ - AlmAck
+ - Andrius Štikonas
+ - Arnaud Ferraris
+ - artoo@cromnix.org
+ - Bernhard Landauer
+ - Bezzy1999
+ - Bill Auguer
+ - bill-auger
+ - Caio Jordão Carvalho
+ - Collabora LTD
+ - crispg72
+ - Dan Simmons
+ - demmm
+ - Dominic Hayes
+ - Frede H
+ - Gabriel Craciunescu
+ - Harald Sitter
+ - Kai Dohmen
+ - Kevin Kofler
+ - Kyle Robertze
+ - Lisa Vitolo
+ - n3rdopolis
+ - Phil Mueller
+ - Philip Mueller
+ - Philip Müller
+ - Ramon Buldó
+ - Raul Rodrigo Segura
+ - Rohan Garg
+ - Scott Harvey
+ - Simon Quigley
+ - Walter Lapchynski