diff --git a/AUTHORS b/AUTHORS
index 614dec3735a..3f01ff5cc89 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -115,6 +115,9 @@ ScummVM Team
   -----------------
      All active team members
 
+  Documentation
+  -------------
+     Joachim Eberhard     
   Retired Team Members
   --------------------
      Tore Anderson         - Former Debian GNU/Linux maintainer
@@ -206,7 +209,6 @@ Special thanks to
    Patrick Combet   - For the original Gobliiins ADL player
    Ivan Dubrov      - For contributing the initial version of the Gobliiins
                       engine
-   Joachim Eberhard - For numerous contributions to documentation
    Jezar            - For his freeverb filter implementation
    Jim Leiterman    - Various info on his FM-TOWNS/Marty SCUMM ports
    lloyd            - For deep tech details about C64 Zak & MM
diff --git a/doc/credits.tex b/doc/credits.tex
index 3b20ae74145..7aaa6c5394b 100644
--- a/doc/credits.tex
+++ b/doc/credits.tex
@@ -188,6 +188,10 @@
 \item
 All active team members
 \end{list}
+\item \textbf{\large Documentation}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+    Joachim Eberhard & \textit{}\\
+\end{list}
 \item \textbf{\large Retired Team Members}
 \begin{list}{}{\setlength{\leftmargin}{0.2cm}}
 \item  \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}}
@@ -316,7 +320,6 @@ And to all the contributors, users, and beta testers we've missed. Thanks!
     Kevin Carnes & \textit{For Scumm16, the basis of ScummVM's older gfx codecs}\\
     Patrick Combet & \textit{For the original Gobliiins ADL player}\\
     Ivan Dubrov & \textit{For contributing the initial version of the Gobliiins engine}\\
-    Joachim Eberhard & \textit{For numerous contributions to documentation}\\
     Jezar & \textit{For his freeverb filter implementation}\\
     Jim Leiterman & \textit{Various info on his FM-TOWNS/Marty SCUMM ports}\\
     lloyd & \textit{For deep tech details about C64 Zak \& MM}\\
diff --git a/gui/credits.h b/gui/credits.h
index 1f6a232c157..7d195b5d626 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -120,6 +120,9 @@ static const char *credits[] = {
 "\\C\\c0""All active team members",
 "\\C\\c0""",
 "\\C\\c0""",
+"\\C\\c1""Documentation",
+"\\C\\c0""Joachim Eberhard",
+"\\C\\c0""",
 "\\C\\c1""Retired Team Members",
 "\\C\\c0""Tore Anderson",
 "\\C\\c2""Former Debian GNU/Linux maintainer",
@@ -247,8 +250,6 @@ static const char *credits[] = {
 "\\C\\c2""For the original Gobliiins ADL player",
 "\\C\\c0""Ivan Dubrov",
 "\\C\\c2""For contributing the initial version of the Gobliiins engine",
-"\\C\\c0""Joachim Eberhard",
-"\\C\\c2""For numerous contributions to documentation",
 "\\C\\c0""Jezar",
 "\\C\\c2""For his freeverb filter implementation",
 "\\C\\c0""Jim Leiterman",
diff --git a/tools/credits.pl b/tools/credits.pl
index 7f972350401..35e91d2ce8b 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -571,6 +571,10 @@ begin_credits("Credits");
 	  add_paragraph("All active team members");
     end_section();
 
+    begin_section("Documentation");
+	add_person("Joachim Eberhard", "joachimeberhard", "");
+    end_section();
+
     begin_section("Retired Team Members");
 	  begin_persons();
 		add_person("Tore Anderson", "tore", "Former Debian GNU/Linux maintainer");
@@ -683,7 +687,6 @@ begin_credits("Credits");
 	  add_person("Kevin Carnes", "", "For Scumm16, the basis of ScummVM's older gfx codecs");
 	  add_person("Patrick Combet", "Dorian Gray", "For the original Gobliiins ADL player");
 	  add_person("Ivan Dubrov", "", "For contributing the initial version of the Gobliiins engine");
-	  add_person("Joachim Eberhard", "joachimeberhard", "For numerous contributions to documentation");
 	  add_person("", "Jezar", "For his freeverb filter implementation");
 	  add_person("Jim Leiterman", "", "Various info on his FM-TOWNS/Marty SCUMM ports");
 	  add_person("", "lloyd", "For deep tech details about C64 Zak & MM");