diff --git a/ChangeLog b/ChangeLog
index 229b5eaffcd6812e844cd826283d161b66ce861b..7911e393197737c31f0ddb20531c25b095b879d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	* MAINTAINERS: Add myself as build system maintainer.
+
 2006-12-15  Simon Martin  <simartin@users.sourceforge.net>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/MAINTAINERS b/MAINTAINERS
index e4c54099339639acd03d91b39e6947bc85d12676..fd45ca2e83068c06bad6890db1787ec174c0a8c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -186,6 +186,7 @@ basic block reordering	Jason Eckhardt		jle@rice.edu
 i18n			Philipp Thomas		pth@suse.de
 i18n			Joseph Myers		jsm@polyomino.org.uk
 diagnostic messages	Gabriel Dos Reis	gdr@integrable-solutions.net
+build machinery (*.in)	Paolo Bonzini		bonzini@gnu.org
 build machinery (*.in)	DJ Delorie		dj@redhat.com
 build machinery (*.in)	Nathanael Nerode	neroden@gcc.gnu.org
 build machinery (*.in)	Alexandre Oliva		aoliva@redhat.com