diff --git a/ChangeLog b/ChangeLog
index 3387de47b7..d6659c3e62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,6 @@
 
 	* testsuite/Rules:
           fix gst-register rules
-	* testsuite/plugin/Makefile.am:
-          move gst-register as a test to only plugin, since it's the only
-          one needing it
 
 2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index d4754e3c9b..d0248f2143 100644
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -9,13 +9,11 @@ GstXML
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### FUNCTION gst_xml_new ##### -->
 <para>
 
@@ -111,6 +109,10 @@ GstXML
 
 </para>
 
+@: 
+@: 
+@:
+
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -120,7 +122,7 @@ GstXML
 
 </para>
 
-@: 
-@: 
-@: 
+@gstxml: the object which received the signal.
+@arg1: 
+@arg2: 
 
diff --git a/tests/old/testsuite/Rules b/tests/old/testsuite/Rules
index 783be28f88..cbb722c1e5 100644
--- a/tests/old/testsuite/Rules
+++ b/tests/old/testsuite/Rules
@@ -7,7 +7,9 @@ TESTS_ENVIRONMENT=\
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
-check_PROGRAMS = $(tests_pass) $(tests_fail)
+check_PROGRAMS = \
+	$(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ \
+	$(tests_pass) $(tests_fail)
 
 # make all tests depend on the versioned gst-register
 $(tests_pass) $(tests_fail): $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@
diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am
index d40b1a0a32..9754ce6170 100644
--- a/tests/old/testsuite/plugin/Makefile.am
+++ b/tests/old/testsuite/plugin/Makefile.am
@@ -3,7 +3,7 @@ include ../Rules
 
 plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
-tests_pass = $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ dynamic linked loading registry static static2
+tests_pass = dynamic linked loading registry static static2
 tests_fail =
 
 
diff --git a/testsuite/Rules b/testsuite/Rules
index 783be28f88..cbb722c1e5 100644
--- a/testsuite/Rules
+++ b/testsuite/Rules
@@ -7,7 +7,9 @@ TESTS_ENVIRONMENT=\
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
-check_PROGRAMS = $(tests_pass) $(tests_fail)
+check_PROGRAMS = \
+	$(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ \
+	$(tests_pass) $(tests_fail)
 
 # make all tests depend on the versioned gst-register
 $(tests_pass) $(tests_fail): $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@
diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am
index d40b1a0a32..9754ce6170 100644
--- a/testsuite/plugin/Makefile.am
+++ b/testsuite/plugin/Makefile.am
@@ -3,7 +3,7 @@ include ../Rules
 
 plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
 
-tests_pass = $(top_builddir)/tools/gst-register-@GST_MAJORMINOR@ dynamic linked loading registry static static2
+tests_pass = dynamic linked loading registry static static2
 tests_fail =