diff --git a/ChangeLog b/ChangeLog
index 37accfcb3..243929ba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-03  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* Makefile.am: Do not recurse into doc if we did not explicitly
+	enabled the documentation build; we just recurse into doc if we
+	are doing a dist or a distcheck.
+
 2008-02-29  Øyvind Kolås  <pippin@o-hand.com>
 
 	Reuse the numeric id's used for picking actors to avoid the potential
diff --git a/Makefile.am b/Makefile.am
index 1c1d43cdf..65b6e578f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,12 @@
 NULL =
 
-SUBDIRS = clutter tests doc
+SUBDIRS = clutter tests
+
+if ENABLE_GTK_DOC
+SUBDIRS += doc
+endif
+
+DIST_SUBDIRS = clutter tests doc
 
 pcfiles = \
 	clutter-$(CLUTTER_API_VERSION).pc \