diff --git a/ChangeLog b/ChangeLog
index 3106632f63..48ad8a801c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-03-29  Andy Wingo  <wingo@pobox.com>
 
+	* po/POTFILES: Remove gstspider.c.
+
+	* configure.ac (AC_OUTPUT): Add missing testsuite makefiles.
+
+	* docs/libs/gstreamer-libs-docs.sgml: 
+	* docs/libs/gstreamer-libs-sections.txt: Remove the section on
+	bytestream.
+
+	* tests/complexity.c (main): Set the length of the preroll queue
+	on the sinks to prevent a lockup.
+
 	* libs/gst/dataprotocol/Makefile.am: 
 	* libs/gst/dataprotocol/dataprotocol-test.c: Remove test, it's
 	the same as the one in check/gst-libs/gdp.c.
diff --git a/configure.ac b/configure.ac
index 0de6f806d9..e5ca119984 100644
--- a/configure.ac
+++ b/configure.ac
@@ -678,6 +678,7 @@ tests/sched/Makefile
 tests/threadstate/Makefile
 testsuite/Makefile
 testsuite/bins/Makefile
+testsuite/bytestream/Makefile
 testsuite/caps/Makefile
 testsuite/cleanup/Makefile
 testsuite/clock/Makefile
@@ -688,6 +689,7 @@ testsuite/elements/Makefile
 testsuite/ghostpads/Makefile
 testsuite/indexers/Makefile
 testsuite/negotiation/Makefile
+testsuite/pad/Makefile
 testsuite/parse/Makefile
 testsuite/plugin/Makefile
 testsuite/refcounting/Makefile
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 4ce067927a..33eb71bead 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -12,7 +12,7 @@ include $(srcdir)/../upload.mak
 
 # generated basefiles
 #basefiles = \
-##		$(DOC_MODULE).types \
+#		$(DOC_MODULE).types \
 #		$(DOC_MODULE)-sections.txt \
 #		$(DOC_MODULE)-docs.sgml
 
diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml
index 6027b5a1ff..21cf7c6957 100644
--- a/docs/libs/gstreamer-libs-docs.sgml
+++ b/docs/libs/gstreamer-libs-docs.sgml
@@ -36,7 +36,6 @@
     <para>
       GStreamer provides some standard libraries you can use to create plugins.
     </para>
-    &GstBytestream;
     &GstDataProtocol;
     &GstGetbits;
     <!-- has not yet been written
diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 88b3f54e0b..d331ecf0f1 100644
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -88,28 +88,6 @@ gst_backbitsX
 swab32
 </SECTION>
 
-<SECTION>
-<FILE>gstbytestream</FILE>
-<INCLUDE>libs/bytestream/bytestream.h</INCLUDE>
-GstByteStream
-gst_bytestream_destroy
-gst_bytestream_flush
-gst_bytestream_flush_fast
-gst_bytestream_get_status
-gst_bytestream_get_timestamp
-gst_bytestream_length
-gst_bytestream_new
-gst_bytestream_peek
-gst_bytestream_peek_bytes
-gst_bytestream_print_status
-gst_bytestream_read
-gst_bytestream_reset
-gst_bytestream_seek
-gst_bytestream_size_hint
-gst_bytestream_tell
-<SUBSECTION Standard>
-</SECTION>
-
 <SECTION>
 <FILE>gstdataprotocol</FILE>
 <INCLUDE>libs/dataprotocol/dataprotocol.h</INCLUDE>
diff --git a/tests/benchmarks/complexity.c b/tests/benchmarks/complexity.c
index e6c428291d..75b20979d3 100644
--- a/tests/benchmarks/complexity.c
+++ b/tests/benchmarks/complexity.c
@@ -87,10 +87,12 @@ main (gint argc, gchar * argv[])
     src = (GstElement *) src_list->data;
     src_list = src_list->next;
 
-    if (i + max_this_level < n_elements)
+    if (i + max_this_level < n_elements) {
       e = gst_element_factory_make ("tee", NULL);
-    else
+    } else {
       e = gst_element_factory_make ("fakesink", NULL);
+      g_object_set (e, "preroll-queue-len", 1, NULL);
+    }
     g_object_set (e, "silent", TRUE, NULL);
     new_src_list = g_slist_prepend (new_src_list, e);
 
diff --git a/tests/complexity.c b/tests/complexity.c
index e6c428291d..75b20979d3 100644
--- a/tests/complexity.c
+++ b/tests/complexity.c
@@ -87,10 +87,12 @@ main (gint argc, gchar * argv[])
     src = (GstElement *) src_list->data;
     src_list = src_list->next;
 
-    if (i + max_this_level < n_elements)
+    if (i + max_this_level < n_elements) {
       e = gst_element_factory_make ("tee", NULL);
-    else
+    } else {
       e = gst_element_factory_make ("fakesink", NULL);
+      g_object_set (e, "preroll-queue-len", 1, NULL);
+    }
     g_object_set (e, "silent", TRUE, NULL);
     new_src_list = g_slist_prepend (new_src_list, e);