diff --git a/desmume/AUTHORS b/desmume/AUTHORS
index 469977351..65d144895 100644
--- a/desmume/AUTHORS
+++ b/desmume/AUTHORS
@@ -6,15 +6,15 @@ Current team
 ------------
 Guillaume Duhamel
 Normmatt
-Bernat Muņoz (shash)
 Riccardo Magliocchetti
-Max Tabachenko (CrazyMax)
+CrazyMax
 zeromus
 rogerman
-Luigi__
 
 Contributors
 ------------
+Bernat Muņoz (shash)
+Luigi__
 Allustar
 amponzi
 Anthony Molinaro
diff --git a/desmume/src/windows/AboutBox.cpp b/desmume/src/windows/AboutBox.cpp
index 01413f9f3..23bb4c860 100644
--- a/desmume/src/windows/AboutBox.cpp
+++ b/desmume/src/windows/AboutBox.cpp
@@ -32,12 +32,13 @@ const char	*team[] = {
 	"Guillaume Duhamel",
 	"Normmatt",
 	"Riccardo Magliocchetti",
-	"Max Tabachenko (CrazyMax)",
+	"CrazyMax",
 	"zeromus",
 	"rogerman",
-	"Luigi__",
 	"",
 	"Contributors\1",
+	"Bernat Muņoz (shash)",
+	"Luigi__",
 	"Allustar",
 	"amponzi",
 	"Anthony Molinaro",
@@ -52,7 +53,6 @@ const char	*team[] = {
 	"Pascal Giard (evilynux)",
 	"Ben Jaques (masscat)",
 	"Jeff Bland",
-	"Bernat Muņoz (shash)",
 	"matusz",
 	"nitsuja",
 	"gocha",