diff --git a/ChangeLog b/ChangeLog
index 327018863b..4d4f358d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-07  Matthias Clasen  <mclasen@redhat.com>
+	
+	* MAINTAINERS: Follow new format regulations.
+
 2007-08-07  Johan Dahlin  <jdahlin@async.com.br>
 
 	* gtk/gtkbuilderparser.c (text): 
diff --git a/MAINTAINERS b/MAINTAINERS
index 9bf862460d..0740dc9013 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 GTK+, and some parts of it 
 are technically maintained by other people. The people listed above are