diff --git a/ChangeLog b/ChangeLog
index f63f05bea9..e1e40190ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-10  Stefan Kost  <ensonic@users.sf.net>
+
+	* docs/libs/Makefile.am:
+	  Remove cruft and do some cleanups.
+
+	* docs/libs/gst-plugins-base-libs-docs.sgml:
+	  Prepare for comming gtkdoc features (rebase against online docs).
+
 2007-08-10  Michael Smith <msmith@fluendo.com>
 
 	* gst/audiorate/gstaudiorate.c: (gst_audio_rate_chain):
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 85696bab0d..42b57ccb72 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -51,7 +51,7 @@ SCAN_OPTIONS=
 #EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt gstreamer-sections.txt $(DOC_MAIN_SGML_FILE)
 
 # Extra options to supply to gtkdoc-mkdb.
-MKDB_OPTIONS=--sgml-mode --ignore-files=trio
+MKDB_OPTIONS=--sgml-mode  --output-format=xml
 
 # Extra options to supply to gtkdoc-fixref.
 FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \
@@ -76,7 +76,7 @@ SCANOBJ_DEPS = \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la
 
 # Header files to ignore when scanning.
-IGNORE_HFILES = 
+IGNORE_HFILES =
 
 # Images to copy into HTML directory.
 HTML_IMAGES =
diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml
index e190d5a4cb..3ef293dc9d 100644
--- a/docs/libs/gst-plugins-base-libs-docs.sgml
+++ b/docs/libs/gst-plugins-base-libs-docs.sgml
@@ -74,7 +74,10 @@
 <book id="index">
   <bookinfo>
     <title>GStreamer Base Plugins &GST_MAJORMINOR; Library Reference Manual</title>
-    <releaseinfo>for GStreamer Library &GST_MAJORMINOR; (&GST_VERSION;)</releaseinfo>
+    <releaseinfo>
+      for GStreamer Library &GST_MAJORMINOR; (&GST_VERSION;)
+      <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-base-libs/html/</ulink>.
+    </releaseinfo>
   </bookinfo>
 
   <part id="gstreamer-plugins-base">