diff --git a/ChangeLog b/ChangeLog
index 55050e055e..39626cffbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15  David Schleef  <ds@schleef.org>
+
+	* docs/Makefile.am: Install docs even when --disable-gtk-doc
+	  is disabled.  This matches the behavior of gtk+.  Fixes #349099.
+
 2007-05-15  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_packet),
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 13a74831a8..48f3112fb7 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,16 +1,10 @@
-if ENABLE_GTK_DOC
-GTK_DOC_DIRS = libs
-else
-GTK_DOC_DIRS =
-endif
-
 if ENABLE_PLUGIN_DOCS
 PLUGIN_DOCS_DIRS = plugins
 else
 PLUGIN_DOCS_DIRS =
 endif
 
-SUBDIRS = design $(GTK_DOC_DIRS) $(PLUGIN_DOCS_DIRS)
+SUBDIRS = design libs $(PLUGIN_DOCS_DIRS)
 DIST_SUBDIRS = design libs plugins
 
 EXTRA_DIST = \