diff --git a/ChangeLog b/ChangeLog
index 4bdc33b6f..0ce3597d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* MAINTAINERS: Update for new format regulations
+
 2007-08-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/MAINTAINERS b/MAINTAINERS
index f7fa49bff..0bb46dc7a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,10 @@
-Email: mclasen@redhat.com
-Email: timj@gtk.org
+Matthias Clasen
+E-mail: mclasen@redhat.com
+Userid: matthiasc
+
+Tim Janik
+E-mail: timj@gtk.org
+Userid: timj
 
 Note that a lot of people are contributing to GLib, and some parts of it 
 are technically maintained by others. The email addresses listed above are