diff --git a/ChangeLog b/ChangeLog
index cc89e4d163..c947851250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-09-23  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/plugins/Makefile.am:
+	* docs/plugins/gst-plugins-base-plugins-docs.sgml:
+	* docs/plugins/gst-plugins-base-plugins-sections.txt:
+	* gst/volume/gstvolume.c:
+	  add/fix docs
+	* gst-libs/gst/audio/audio.c: (gst_audio_frame_byte_size):
+	* gst-libs/gst/audio/audio.h:
+	  add conversion macros for frames <-> clocktime
+
 2005-09-23  David Schleef  <ds@schleef.org>
 
 	* gst/audioresample/Makefile.am:
diff --git a/common b/common
index 793f85c1c1..c7160d5b7c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 793f85c1c14de9c1053b8db7df44bfbba1f0a156
+Subproject commit c7160d5b7c76f00609cf7b6e9b782e99f626686c
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 7bb6d588bc..ed33f56009 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -79,6 +79,7 @@ IGNORE_CFILES = utils.c mem.c imgconvert.c
 EXTRA_HFILES = \
 	$(top_srcdir)/ext/theora/gsttheoraenc.h \
 	$(top_srcdir)/ext/vorbis/vorbisenc.h \
+	$(top_srcdir)/gst/audioconvert/gstaudioconvert.h \
 	$(top_srcdir)/gst/ffmpegcolorspace/gstffmpegcolorspace.h \
 	$(top_srcdir)/gst/tcp/gstmultifdsink.h \
 	$(top_srcdir)/gst/tcp/gsttcpserversink.h \
diff --git a/docs/plugins/gst-plugins-base-plugins-docs.sgml b/docs/plugins/gst-plugins-base-plugins-docs.sgml
index fa97e98905..02cc592fb8 100644
--- a/docs/plugins/gst-plugins-base-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-base-plugins-docs.sgml
@@ -12,6 +12,7 @@
 
   <chapter>
     <title>gst-plugins-base Elements</title>
+    <xi:include href="xml/element-audioconvert.xml" />
     <xi:include href="xml/element-ffmpegcolorspace.xml" />
 <!--
     <xi:include href="xml/element-gnomevfssink.xml" />
diff --git a/docs/plugins/gst-plugins-base-plugins-sections.txt b/docs/plugins/gst-plugins-base-plugins-sections.txt
index 841ca7a411..48c749f43c 100644
--- a/docs/plugins/gst-plugins-base-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-base-plugins-sections.txt
@@ -1,3 +1,12 @@
+
+<SECTION>
+<FILE>element-audioconvert</FILE>
+<TITLE>audioconvert</TITLE>
+GstAudioConvert
+<SUBSECTION Standard>
+GstAudioConvertClass
+</SECTION>
+
 <SECTION>
 <FILE>element-ffmpegcolorspace</FILE>
 <TITLE>ffmpegcolorspace</TITLE>
@@ -6,6 +15,7 @@ GstFFMpegCsp
 GstFFMpegCspClass
 </SECTION>
 
+<SECTION>
 <FILE>element-multifdsink</FILE>
 <TITLE>multifdsink</TITLE>
 GstMultiFdSink
@@ -39,15 +49,16 @@ GstTCPServerSinkClass
 <FILE>element-theoraenc</FILE>
 <TITLE>theoraenc</TITLE>
 GstTheoraEnc
+GstTheoraEncBorderMode
 <SUBSECTION Standard>
 GstTheoraEncClass
 </SECTION>
 
-
 <SECTION>
 <FILE>element-videotestsrc</FILE>
 <TITLE>videotestsrc</TITLE>
 GstVideoTestSrc
+GstVideoTestSrcPattern
 <SUBSECTION Standard>
 GstVideoTestSrcClass
 </SECTION>
diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c
index 6385ce03b9..e86992556a 100644
--- a/gst-libs/gst/audio/audio.c
+++ b/gst-libs/gst/audio/audio.c
@@ -32,7 +32,7 @@ gst_audio_frame_byte_size (GstPad * pad)
 /* calculate byte size of an audio frame
  * this should be moved closer to the gstreamer core
  * and be implemented for every mime type IMO
- * returns -1 if there's an error (to avoid division by zero), 
+ * returns -1 if there's an error (to avoid division by zero),
  * or the byte size if everything's ok
  */
 
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index 8a2a832ece..4ec9320728 100644
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -49,6 +49,13 @@ G_BEGIN_DECLS
  * Andy Wingo, 18 August 2001
  * Thomas, 6 September 2002 */
 
+/* conversion macros */
+#define GST_FRAMES_TO_CLOCK_TIME(frames, rate) \
+  ((GstClockTime) (((gdouble) frames / rate) * GST_SECOND))
+
+#define GST_CLOCK_TIME_TO_FRAMES(clocktime, rate) \
+  ((gint64) (((gdouble) clocktime / GST_SECOND) * rate))
+
 #define GST_AUDIO_DEF_RATE 44100
 
 #define GST_AUDIO_INT_PAD_TEMPLATE_CAPS \
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index b7d4fd0aa3..2583006df0 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -30,7 +30,8 @@
  * <programlisting>
  * gst-launch -v -m sinesrc ! volume volume=0.5 ! level ! fakesink silent=TRUE
  * </programlisting>
- * This pipeline shows that the level of sinesrc has been halved compared to
+ * This pipeline shows that the level of sinesrc has been halved
+ * (peak values are around -6 dB and RMS around -9 dB) compared to
  * the same pipeline without the volume element.
  * </para>
  * </refsect2>