diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index a9b1fe9299..7373723915 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -16,7 +16,9 @@ EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt $
 
 HTML_DIR=$(datadir)/gstreamer/html
 
-GST_LIBS += $(top_builddir)/gst/elements/libgstelements.la
+GST_LIBS += $(top_builddir)/gst/elements/libgstelements.la \
+	    $(top_builddir)/gst/autoplug/libgststaticautoplug.la \
+	    $(top_builddir)/gst/autoplug/libgststaticautoplugrender.la
 
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
diff --git a/docs/gst/gstreamer.hierarchy b/docs/gst/gstreamer.hierarchy
index fa34a9ae50..9b9cf68091 100644
--- a/docs/gst/gstreamer.hierarchy
+++ b/docs/gst/gstreamer.hierarchy
@@ -47,3 +47,11 @@ GtkObject
         GstQueue
         GstTypeFind
       GstPad
+      GstPluginFeature
+        GstAutoplugFactory
+        GstTypeFactory
+        GstElementFactory
+      GstSchedule
+      GstAutoplug
+        GstStaticAutoplug
+        GstStaticAutoplugRender
diff --git a/docs/gst/gstreamer.types.in b/docs/gst/gstreamer.types.in
index d5bc1deeb9..a16572f7f3 100644
--- a/docs/gst/gstreamer.types.in
+++ b/docs/gst/gstreamer.types.in
@@ -9,6 +9,12 @@ gst_pipeline_get_type
 gst_pad_get_type
 gst_thread_get_type
 gst_tee_get_type
+gst_plugin_feature_get_type
+gst_schedule_get_type
+gst_autoplugfactory_get_type
+gst_typefactory_get_type
+gst_elementfactory_get_type
+gst_xml_get_type
 
 gst_aggregator_get_type
 gst_fakesrc_get_type
diff --git a/docs/gst/tmpl/gstautoplug.sgml b/docs/gst/tmpl/gstautoplug.sgml
index 61e1815ac6..f07c1c5d88 100644
--- a/docs/gst/tmpl/gstautoplug.sgml
+++ b/docs/gst/tmpl/gstautoplug.sgml
@@ -100,7 +100,6 @@ Use the regular gst_object_destroy() call to destroy the autoplugger.
 
 </para>
 
-@object: 
 
 <!-- ##### ENUM GstAutoplugFlags ##### -->
 <para>
@@ -116,9 +115,6 @@ The type of the autoplugger.
 
 </para>
 
-@feature: 
-@longdesc: 
-@type: 
 
 <!-- ##### FUNCTION gst_autoplug_signal_new_object ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index 4370578d1f..5903439f83 100644
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -225,12 +225,6 @@ of the element, the GtkType value for it, as well as a pointer to the
 GstElementDetails struct for the element.
 </para>
 
-@feature: 
-@type: 
-@details_dynamic: 
-@details: 
-@padtemplates: 
-@numpadtemplates: 
 
 <!-- ##### USER_FUNCTION GstElementLoopFunction ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml
index cf50e92a81..f9a8c94007 100644
--- a/docs/gst/tmpl/gstobject.sgml
+++ b/docs/gst/tmpl/gstobject.sgml
@@ -296,3 +296,8 @@ this signal to insert custom XML tags into the core XML.
 @gstobject: the object which received the signal.
 @arg1: the xmlNodePtr of the parent node
 
+<!-- ##### ARG GstObject:name ##### -->
+<para>
+
+</para>
+
diff --git a/docs/gst/tmpl/gsttypefactory.sgml b/docs/gst/tmpl/gsttypefactory.sgml
index 0ac10c4286..a3e03af0f6 100644
--- a/docs/gst/tmpl/gsttypefactory.sgml
+++ b/docs/gst/tmpl/gsttypefactory.sgml
@@ -56,10 +56,6 @@ gst_plugin_add_feature() as shown in the example:
 The struct with the typefactory information.
 </para>
 
-@feature: 
-@mime: 
-@exts: 
-@typefindfunc: 
 
 <!-- ##### STRUCT GstTypeDefinition ##### -->
 <para>
diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 4388cd421d..933c2427c2 100644
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -103,3 +103,12 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 @arg1: 
 @arg2: 
 
+<!-- ##### SIGNAL GstXml::object-loaded ##### -->
+<para>
+
+</para>
+
+@gstxml: the object which received the signal.
+@arg1: 
+@arg2: 
+