diff --git a/ChangeLog b/ChangeLog
index 1b09b6b14c..520f9e034d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-26  Julien MOUTTE  <julien@moutte.net>
+
+	* docs/libs/gst-plugins-base-libs-docs.sgml:
+	* docs/libs/gst-plugins-base-libs-sections.txt:
+	* docs/libs/tmpl/gstcolorbalance.sgml:
+	* docs/libs/tmpl/gstmixer.sgml:
+	* docs/libs/tmpl/gstxoverlay.sgml: Add the XOverlay interface
+	to documentation.
+
 2005-11-26  Julien MOUTTE  <julien@moutte.net>
 
 	* docs/plugins/Makefile.am:
diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml
index d8c4bb5401..169416efeb 100644
--- a/docs/libs/gst-plugins-base-libs-docs.sgml
+++ b/docs/libs/gst-plugins-base-libs-docs.sgml
@@ -11,6 +11,7 @@
 <!ENTITY GstMixer SYSTEM "xml/gstmixer.xml">
 <!ENTITY GstRingBuffer SYSTEM "xml/gstringbuffer.xml">
 <!ENTITY GstTuner SYSTEM "xml/gsttuner.xml">
+<!ENTITY GstXOverlay SYSTEM "xml/gstxoverlay.xml">
 
 ]>
 <book id="index">
@@ -48,6 +49,7 @@ This library should be linked to by getting cflags and libs from
     &GstColorBalance;
     &GstMixer;
     &GstTuner;
+    &GstXOverlay;
   </chapter>
 
   <chapter id="gstreamer-gconf">
diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 207ab05a6e..e514b89aea 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -104,4 +104,14 @@ gst_tuner_frequency_changed
 gst_tuner_signal_changed
 </SECTION>
 
+<SECTION>
+<FILE>gstxoverlay</FILE>
+<INCLUDE>gst/interfaces/xoverlay.h</INCLUDE>
+GstXOverlay
+GstXOverlayClass
+gst_x_overlay_set_xwindow_id
+gst_x_overlay_got_xwindow_id
+gst_x_overlay_prepare_xwindow_id
+gst_x_overlay_expose
+</SECTION>
 
diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml
index 500f4853f0..e8795a0dd6 100644
--- a/docs/libs/tmpl/gstcolorbalance.sgml
+++ b/docs/libs/tmpl/gstcolorbalance.sgml
@@ -23,15 +23,6 @@ gstcolorbalance
 </para>
 
 
-<!-- ##### SIGNAL GstColorBalance::value-changed ##### -->
-<para>
-
-</para>
-
-@gstcolorbalance: the object which received the signal.
-@arg1: 
-@arg2: 
-
 <!-- ##### STRUCT GstColorBalanceClass ##### -->
 <para>
 
diff --git a/docs/libs/tmpl/gstmixer.sgml b/docs/libs/tmpl/gstmixer.sgml
index 6c1c9e3ea1..8987543de9 100644
--- a/docs/libs/tmpl/gstmixer.sgml
+++ b/docs/libs/tmpl/gstmixer.sgml
@@ -47,12 +47,18 @@ gstmixer
 
 </para>
 
+@parent: 
+@values: 
+@_gst_reserved: 
 
 <!-- ##### STRUCT GstMixerTrack ##### -->
 <para>
 
 </para>
 
+@parent: 
+@label: 
+@flags: 
 
 <!-- ##### FUNCTION gst_mixer_list_tracks ##### -->
 <para>
diff --git a/docs/libs/tmpl/gstxoverlay.sgml b/docs/libs/tmpl/gstxoverlay.sgml
new file mode 100644
index 0000000000..c6d8c67a71
--- /dev/null
+++ b/docs/libs/tmpl/gstxoverlay.sgml
@@ -0,0 +1,70 @@
+<!-- ##### SECTION Title ##### -->
+gstxoverlay
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT GstXOverlay ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT GstXOverlayClass ##### -->
+<para>
+
+</para>
+
+@klass: 
+@set_xwindow_id: 
+@expose: 
+
+<!-- ##### FUNCTION gst_x_overlay_set_xwindow_id ##### -->
+<para>
+
+</para>
+
+@overlay: 
+@xwindow_id: 
+
+
+<!-- ##### FUNCTION gst_x_overlay_got_xwindow_id ##### -->
+<para>
+
+</para>
+
+@overlay: 
+@xwindow_id: 
+
+
+<!-- ##### FUNCTION gst_x_overlay_prepare_xwindow_id ##### -->
+<para>
+
+</para>
+
+@overlay: 
+
+
+<!-- ##### FUNCTION gst_x_overlay_expose ##### -->
+<para>
+
+</para>
+
+@overlay: 
+
+