diff --git a/configure.in b/configure.in
index b887039521..217c77616d 100644
--- a/configure.in
+++ b/configure.in
@@ -301,6 +301,7 @@ gst/xml/Makefile
 libs/Makefile
 libs/riff/Makefile
 libs/colorspace/Makefile
+libs/getbits/Makefile
 plugins/Makefile
 plugins/au/Makefile
 plugins/wav/Makefile
diff --git a/docs/gst/gstreamer-decl.txt b/docs/gst/gstreamer-decl.txt
index 1ad134b115..ce2f17a172 100644
--- a/docs/gst/gstreamer-decl.txt
+++ b/docs/gst/gstreamer-decl.txt
@@ -359,6 +359,64 @@ GstBuffer *buffer
 <RETURNS>void  </RETURNS>
 GstBuffer *buffer,GstMeta *meta
 </FUNCTION>
+<TYPEDEF>
+<NAME>GstClockTime</NAME>
+typedef guint64 GstClockTime;
+</TYPEDEF>
+<TYPEDEF>
+<NAME>GstClockTimeDiff</NAME>
+typedef gint64 GstClockTimeDiff;
+</TYPEDEF>
+<MACRO>
+<NAME>GST_CLOCK_DIFF</NAME>
+#define GST_CLOCK_DIFF(s, e) (GstClockTimeDiff)((s)-(e))
+</MACRO>
+<STRUCT>
+<NAME>GstClock</NAME>
+</STRUCT>
+<STRUCT>
+<NAME>GstClock</NAME>
+struct GstClock {
+  gchar *name;
+  GstClockTime start_time;
+  GstClockTime current_time;
+  GstClockTimeDiff adjust;
+  gboolean locking;
+  GList *sinkobjects;
+  GMutex *sinkmutex;
+  GMutex *lock;
+};
+</STRUCT>
+<FUNCTION>
+<NAME>gst_clock_new</NAME>
+<RETURNS>GstClock  *</RETURNS>
+gchar *name
+</FUNCTION>
+<FUNCTION>
+<NAME>gst_clock_get_system</NAME>
+<RETURNS>GstClock  *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
+<NAME>gst_clock_register</NAME>
+<RETURNS>void  </RETURNS>
+GstClock *clock, GstObject *obj
+</FUNCTION>
+<FUNCTION>
+<NAME>gst_clock_set</NAME>
+<RETURNS>void  </RETURNS>
+GstClock *clock, GstClockTime time
+</FUNCTION>
+<FUNCTION>
+<NAME>gst_clock_reset</NAME>
+<RETURNS>void  </RETURNS>
+GstClock *clock
+</FUNCTION>
+<FUNCTION>
+<NAME>gst_clock_wait</NAME>
+<RETURNS>void  </RETURNS>
+GstClock *clock, GstClockTime time, GstObject *obj
+</FUNCTION>
 <MACRO>
 <NAME>GST_TYPE_CONNECTION</NAME>
 #define GST_TYPE_CONNECTION \
@@ -1876,8 +1934,11 @@ struct GstAudioSink {
 
   GstPad *sinkpad;
 
+  GstClockTime clocktime;
+  GstClock *clock;
   /* soundcard state */
   int fd;
+  int caps; /* the capabilities */
   gint format;
   gint channels;
   gint frequency;
@@ -2630,7 +2691,7 @@ struct MetaVideoRaw {
 
   /* formatting information */
   gint format;
-	GdkVisual *visual;
+  GdkVisual *visual;
   // dimensions of the video buffer
   gint width;
   gint height;
diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml
index 3a53dc78ab..ad4dac80b6 100644
--- a/docs/gst/tmpl/gstreamer-unused.sgml
+++ b/docs/gst/tmpl/gstreamer-unused.sgml
@@ -167,13 +167,6 @@
 
 @Returns: 
 
-<!-- ##### FUNCTION gst_object_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
 <!-- ##### MACRO GST_SINESRC ##### -->
 <para>
 
@@ -181,19 +174,19 @@
 
 @obj: 
 
-<!-- ##### SECTION ./tmpl/plugin.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gst_audiosrc_get_type ##### -->
+<!-- ##### FUNCTION gst_object_get_type ##### -->
 <para>
 
 </para>
 
 @Returns: 
 
+<!-- ##### SECTION ./tmpl/plugin.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GST_QUEUE_CLASS ##### -->
 <para>
 
@@ -201,6 +194,13 @@
 
 @klass: 
 
+<!-- ##### FUNCTION gst_audiosrc_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
 <!-- ##### MACRO GST_IS_QUEUE ##### -->
 <para>
 
@@ -339,12 +339,6 @@
 </para>
 
 
-<!-- ##### STRUCT GstFakeSink ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO GST_THREAD_CLASS ##### -->
 <para>
 
@@ -352,6 +346,12 @@
 
 @klass: 
 
+<!-- ##### STRUCT GstFakeSink ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GST_BIN_CLASS ##### -->
 <para>
 
@@ -660,14 +660,14 @@ The frequency.
 </para>
 
 
-<!-- ##### MACRO GST_ASYNCDISKSRC_CLASS ##### -->
+<!-- ##### MACRO GST_ESDSINK_CLASS ##### -->
 <para>
 
 </para>
 
 @klass: 
 
-<!-- ##### MACRO GST_ESDSINK_CLASS ##### -->
+<!-- ##### MACRO GST_ASYNCDISKSRC_CLASS ##### -->
 <para>
 
 </para>
@@ -1267,13 +1267,6 @@ plugin
 </para>
 
 
-<!-- ##### MACRO GST_META ##### -->
-<para>
-
-</para>
-
-@meta: 
-
 <!-- ##### FUNCTION gst_audiosink_get_type ##### -->
 <para>
 
@@ -1281,6 +1274,13 @@ plugin
 
 @Returns: 
 
+<!-- ##### MACRO GST_META ##### -->
+<para>
+
+</para>
+
+@meta: 
+
 <!-- ##### FUNCTION gst_httpsrc_get_type ##### -->
 <para>
 
@@ -1322,6 +1322,12 @@ plugin
 </para>
 
 
+<!-- ##### MACRO GST_TYPE_FILTER ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GST_IS_SINESRC_CLASS ##### -->
 <para>
 
@@ -1329,12 +1335,6 @@ plugin
 
 @obj: 
 
-<!-- ##### MACRO GST_TYPE_FILTER ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO GST_IS_AUDIOSRC_CLASS ##### -->
 <para>
 
@@ -1412,6 +1412,10 @@ GstElement
 
 @obj: 
 
+<!-- ##### SECTION ./tmpl/plugin.sgml:Short_Description ##### -->
+
+
+
 <!-- ##### FUNCTION gst_audiosrc_push ##### -->
 <para>
 
@@ -1419,10 +1423,6 @@ GstElement
 
 @src: 
 
-<!-- ##### SECTION ./tmpl/plugin.sgml:Short_Description ##### -->
-
-
-
 <!-- ##### MACRO GST_HTTPSRC_CLASS ##### -->
 <para>
 
diff --git a/libs/Makefile.am b/libs/Makefile.am
index 2d992366d3..2e0eff56cd 100644
--- a/libs/Makefile.am
+++ b/libs/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = riff colorspace
+SUBDIRS = riff colorspace getbits
 
-DIST_SUBDIRS = riff colorspace
+DIST_SUBDIRS = riff colorspace getbits
diff --git a/test/mp3play.c b/test/mp3play.c
index 60d63add25..f0cabbcd0f 100644
--- a/test/mp3play.c
+++ b/test/mp3play.c
@@ -1,6 +1,5 @@
 #include <gst/gst.h>
 
-extern gboolean _gst_plugin_spew;
 
 void eof(GstSrc *src) {
    g_print("have eof, quitting\n");
@@ -15,10 +14,9 @@ int main(int argc,char *argv[]) {
 
   g_print("have %d args\n",argc);
 
-  _gst_plugin_spew = TRUE;
   gst_init(&argc,&argv);
-// gst_plugin_load("mp3parse");
-  gst_plugin_load_all();
+  gst_plugin_load("mp3parse");
+  gst_plugin_load("mpg123");
 
   pipeline = gst_pipeline_new("pipeline");
   g_return_if_fail(pipeline != NULL);