diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 8bcd47e49..5360c58e3 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-05  Michael Natterer  <mitch@imendio.com>
+
+	* Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent
+	code from being checked in that breaks the build of applications
+	which use G_DISABLE_SINGLE_INCLUDES.
+
 2008-03-16  Tor Lillqvist  <tml@novell.com>
 
 	* Makefile.am: Define gobject_def locally here instead of using an
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 4d59fc035..2274f9f83 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -13,6 +13,7 @@ AM_CPPFLAGS = 					\
 	-I$(top_builddir)			\
 	$(GLIB_DEBUG_FLAGS)			\
 	-DG_DISABLE_DEPRECATED			\
+	-DG_DISABLE_SINGLE_INCLUDES		\
 	-DGOBJECT_COMPILATION			\
 	-DG_DISABLE_CONST_RETURNS