diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua
index 58db129fb..962d2a3b4 100644
--- a/builtin/mainmenu/tab_credits.lua
+++ b/builtin/mainmenu/tab_credits.lua
@@ -20,51 +20,31 @@
 local core_developers = {
 	"Perttu Ahola (celeron55) <celeron55@gmail.com>",
 	"sfan5 <sfan5@live.de>",
-	"ShadowNinja <shadowninja@minetest.net>",
 	"Nathanaël Courant (Nore/Ekdohibs) <nore@mesecons.net>",
 	"Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>",
 	"paramat",
 	"Auke Kok (sofar) <sofar@foo-projects.org>",
-	"rubenwardy <rw@rubenwardy.com>",
+	"Andrew Ward (rubenwardy) <rw@rubenwardy.com>",
 	"Krock/SmallJoker <mk939@ymail.com>",
 	"Lars Hofhansl <larsh@apache.org>",
 }
 
 local active_contributors = {
-	"numberZero [Audiovisuals: meshgen]",
-	"stujones11 [Android UX improvements]",
-	"red-001 <red-001@outlook.ie> [CSM & Menu fixes]",
-	"Paul Ouellette (pauloue) [Docs, fixes]",
-	"Dániel Juhász (juhdanad) <juhdanad@gmail.com> [Audiovisuals: lighting]",
-	"Hybrid Dog [API]",
-	"srifqi [Android]",
-	"Vincent Glize (Dumbeldor) [Cleanups, CSM APIs]",
-	"Ben Deutsch [Rendering, Fixes, SQLite auth]",
-	"Wuzzy [Translation, Slippery]",
-	"ANAND (ClobberXD) [Docs, Fixes]",
-	"Shara/Ezhh [Docs, Game API]",
-	"DTA7 [Fixes, mute key]",
-	"Thomas-S [Disconnected, Formspecs]",
-	"Raymoo [Tool Capabilities]",
-	"Elijah Duffy (octacian) [Mainmenu]",
-	"noob3167 [Fixes]",
-	"adelcoding1 [Formspecs]",
-	"adrido [Windows Installer, Formspecs]",
-	"Rui [Sound Pitch]",
-	"Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com> [Audiovisuals]",
-	"Esteban (EXio4) [Cleanups]",
-	"Vaughan Lapsley (vlapsley) [Carpathian mapgen]",
-	"CoderForTheBetter [Add set_rotation]",
-	"Quentin Bazin (Unarelith) [Cleanups]",
+	"Hugues Ross [Formspecs]",
 	"Maksim (MoNTE48) [Android]",
-	"Gaël-de-Sailly [Mapgen, pitch fly]",
-	"zeuner [Docs, Fixes]",
-	"ThomasMonroe314 (tre) [Fixes]",
-	"Rob Blanckaert (basicer) [Fixes]",
-	"Jozef Behran (osjc) [Fixes]",
-	"random-geek [Fixes]",
-	"Pedro Gimeno (pgimeno) [Fixes]",
-	"lisacvuk [Fixes]",
+	"DS [Formspecs]",
+	"pyrollo [Formspecs: Hypertext]",
+	"v-rob [Formspecs]",
+	"Jordach [set_sky]",
+	"random-geek [Formspecs]",
+	"Wuzzy [Pathfinder, builtin, translations]",
+	"ANAND (ClobberXD) [Fixes, per-player FOV]",
+	"Warr1024 [Fixes]",
+	"Paul Ouellette (pauloue) [Fixes, Script API]",
+	"Jean-Patrick G (kilbith) <jeanpatrick.guerrero@gmail.com> [Audiovisuals]",
+	"HybridDog [Script API]",
+	"dcbrwn [Object shading]",
+	"srifqi [Fixes]",
 }
 
 local previous_core_developers = {
@@ -79,24 +59,31 @@ local previous_core_developers = {
 	"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>",
 	"sapier",
 	"Zeno",
+	"ShadowNinja <shadowninja@minetest.net>",
 }
 
 local previous_contributors = {
-	"Gregory Currie (gregorycu) [optimisation]",
-	"Diego Martínez (kaeza) <kaeza@users.sf.net>",
-	"T4im [Profiler]",
-	"TeTpaAka [Hand overriding, nametag colors]",
-	"Duane Robertson <duane@duanerobertson.com> [MGValleys]",
-	"neoascetic [OS X Fixes]",
-	"TriBlade9 <triblade9@mail.com> [Audiovisuals]",
-	"Jurgen Doser (doserj) <jurgen.doser@gmail.com> [Fixes]",
-	"MirceaKitsune <mirceakitsune@gmail.com> [Audiovisuals]",
-	"Guiseppe Bilotta (Oblomov) <guiseppe.bilotta@gmail.com> [Fixes]",
-	"matttpt <matttpt@gmail.com> [Fixes]",
 	"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest Logo]",
+	"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
+	"red-001 <red-001@outlook.ie>",
+	"numberZero [Audiovisuals: meshgen]",
+	"Giuseppe Bilotta",
+	"MirceaKitsune <mirceakitsune@gmail.com>",
+	"Constantin Wenger (SpeedProg)",
+	"Ciaran Gultnieks (CiaranG)",
+	"stujones11 [Android UX improvements]",
 	"Jeija <jeija@mesecons.net> [HTTP, particles]",
-	"bigfoot547 [CSM]",
+	"Vincent Glize (Dumbeldor) [Cleanups, CSM APIs]",
+	"Ben Deutsch [Rendering, Fixes, SQLite auth]",
+	"TeTpaAka [Hand overriding, nametag colors]",
+	"Rui [Sound Pitch]",
+	"Duane Robertson <duane@duanerobertson.com> [MGValleys]",
+	"Raymoo [Tool Capabilities]",
 	"Rogier <rogier777@gmail.com> [Fixes]",
+	"Gregory Currie (gregorycu) [optimisation]",
+	"TriBlade9 <triblade9@mail.com> [Audiovisuals]",
+	"T4im [Profiler]",
+	"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
 }
 
 local function buildCreditList(source)