diff --git a/lib/CREDITS b/lib/CREDITS
index 7144745f23..ad15d07a70 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -76,6 +76,9 @@
 @bEdscott Wilson Garcia
 @iE-mail: edscott@xfce.org
    Bug fixes
+@bMichael Gerz
+@iE-mail: michael.gerz@teststep.org
+   lots of bug reports, German localization, bug fixes
 @bStefano Ghirlanda
 @iE-mail: stefano.ghirlanda@unibo.it
    Improvements to lyxserver
@@ -235,9 +238,6 @@
 @bEulogio Serradilla Rodríguez
 @iE-mail: eulogio.sr@terra.es
    contribution to the spanish internationalization
-@bMichael Gerz
-@iE-mail: michael.gerz@teststep.org
-   lots of bug reports, German localization, bug fixes
 @bHubert Schreier
 @iE-mail: schreier@sc.edu
    spellchecker (ispell frontend); beautiful document-manager based on the simple table of contents (removed)
diff --git a/lib/ChangeLog b/lib/ChangeLog
index f621ae136f..f25240044c 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-03  Michael Gerz  <michael.gerz@teststep.org>
+
+	* generate_contributions.py:
+	* CREDITS: move my entry into alphabetical order
+
 2005-09-21  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* scripts/legacy_lyxpreview2ppm.py:
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index ef08128213..1d2760ccff 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -524,6 +524,14 @@ contributers = [
                  "30 March 2005",
                  u"Bug fixes"),
 
+     contributer(u"Michael Gerz",
+                 "michael.gerz () teststep ! org",
+                 "GPL",
+                 "Re: The LyX licence",
+                 "m=110909251110103",
+                 "22 February 2005",
+                 u"lots of bug reports, German localization, bug fixes"),
+
      contributer(u"Stefano Ghirlanda",
                  "stefano.ghirlanda () unibo ! it",
                  "GPL",
@@ -956,14 +964,6 @@ contributers = [
                  "23 February 2005",
                  u"contribution to the spanish internationalization"),
 
-     contributer(u"Michael Gerz",
-                 "michael.gerz () teststep ! org",
-                 "GPL",
-                 "Re: The LyX licence",
-                 "m=110909251110103",
-                 "22 February 2005",
-                 u"lots of bug reports, German localization, bug fixes"),
-
      contributer(u"Hubert Schreier",
                  "schreier () sc ! edu",
                  "",