diff --git a/ChangeLog b/ChangeLog
index 880fd38842..258afe0614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-12-20  Stefan Kost  <ensonic@users.sf.net>
+
+	* Makefile.am:
+	* configure.ac:
+	* docs/Makefile.am:
+	* docs/libs/Makefile.am:
+	* docs/libs/gst-plugins-libs-docs.sgml:
+	* docs/libs/gst-plugins-libs-sections.txt:
+	* docs/libs/tmpl/gstgconf.sgml:
+	* docs/upload.mak:
+	* docs/version.entities.in:
+	  Added boilerplate gtk-doc files for plugin-libs documentation.
+
 2004-12-19  Stephane Loeuillet  <stephane.loeuillet@tiscali.fr>
 
 	* gst/auparse/gstauparse.c: fix int and float audio caps
diff --git a/Makefile.am b/Makefile.am
index e20dd34a4e..ed18dd7302 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
+if BUILD_DOCS
+SUBDIRS_DOCS = docs
+else
+SUBDIRS_DOCS =
+endif
+
 if USE_GCONFTOOL
 GCONF_DIR=gconf
 else
@@ -25,7 +31,8 @@ SUBDIRS=gst-libs \
 	po \
 	common \
 	m4 \
-	pkgconfig
+	pkgconfig \
+	$(SUBDIRS_DOCS)
 
 DIST_SUBDIRS=ext gst-libs \
 	gst sys \
diff --git a/configure.ac b/configure.ac
index 156939ead6..a3621fdb2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_ARG_WITH(pkg-config-path,
    AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]),
    [export PKG_CONFIG_PATH=${withval}])
 
+GST_DOC()
 dnl check architecture
 GST_ARCH()
 
@@ -2087,6 +2088,9 @@ pkgconfig/gstreamer-plugins-uninstalled.pc
 po/Makefile.in
 common/Makefile
 common/m4/Makefile
+docs/Makefile
+docs/libs/Makefile
+docs/version.entities
 m4/Makefile
 )
 AC_OUTPUT