diff --git a/ChangeLog b/ChangeLog
index b76555cff6..f4cb583bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst-libs/gst/audio/Makefile.am:
+	  folded audiofilter into the audio library
+
 2005-11-29  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/videoscale/gstvideoscale.h:
diff --git a/common b/common
index f31468e933..33084fbe05 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f31468e933b5b980398cf636a37abf16ca46c4a0
+Subproject commit 33084fbe0531733bc02aa1d9de608206d5553a15
diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml
index ccb0ae227b..7ac9f04e8f 100644
--- a/docs/libs/tmpl/gstcolorbalance.sgml
+++ b/docs/libs/tmpl/gstcolorbalance.sgml
@@ -23,15 +23,6 @@ interface for adjusting color balance settings
 </para>
 
 
-<!-- ##### SIGNAL GstColorBalance::value-changed ##### -->
-<para>
-
-</para>
-
-@gstcolorbalance: the object which received the signal.
-@arg1: 
-@arg2: 
-
 <!-- ##### STRUCT GstColorBalanceClass ##### -->
 <para>
 
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 7e1bdd18a9..59eb828d09 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -8,8 +8,7 @@ built_headers = multichannel-enumtypes.h
 BUILT_SOURCES = $(built_sources) $(built_headers)
 
 lib_LTLIBRARIES = \
-	libgstaudio-@GST_MAJORMINOR@.la \
-	libgstaudiofilter-@GST_MAJORMINOR@.la
+	libgstaudio-@GST_MAJORMINOR@.la
 noinst_LTLIBRARIES = libgstaudiofilterexample.la
 
 EXTRA_DIST = gstaudiofiltertemplate.c make_filter
@@ -18,6 +17,7 @@ CLEANFILES = gstaudiofilterexample.c \
 
 libgstaudio_@GST_MAJORMINOR@_la_SOURCES = audio.c gstaudioclock.c \
 	multichannel.c \
+	gstaudiofilter.c \
 	gstaudiosink.c \
 	gstaudiosrc.c \
 	gstbaseaudiosink.c \
@@ -44,11 +44,6 @@ libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
 libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
-libgstaudiofilter_@GST_MAJORMINOR@_la_SOURCES = gstaudiofilter.c gstaudiofilter.h
-libgstaudiofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
-libgstaudiofilter_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
-libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
-
 libgstaudiofilterexample_la_SOURCES = gstaudiofilterexample.c
 libgstaudiofilterexample_la_CFLAGS = $(GST_CFLAGS)
 libgstaudiofilterexample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)