diff --git a/ChangeLog b/ChangeLog
index 6f39b96926..fa878b557c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-23  David Schleef  <ds@schleef.org>
+
+	* gst/volume/gstvolume.c: (volume_init): Proxy getcaps.
+	* sys/oss/gstosssink.c: (gst_osssink_init),
+	(gst_osssink_sink_fixate): Add fixate function.
+
 2003-12-24  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c:
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index b1ff2cf8a0..de7ebf14e1 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -218,9 +218,11 @@ volume_init (GstVolume *filter)
 {
   filter->sinkpad = gst_pad_new_from_template(
       gst_static_pad_template_get (&volume_sink_factory),"sink");
+  gst_pad_set_getcaps_function (filter->sinkpad, gst_pad_proxy_getcaps);
   gst_pad_set_link_function(filter->sinkpad,volume_connect);
   filter->srcpad = gst_pad_new_from_template(
       gst_static_pad_template_get (&volume_src_factory),"src");
+  gst_pad_set_getcaps_function (filter->srcpad, gst_pad_proxy_getcaps);
   gst_pad_set_link_function(filter->srcpad,volume_connect);
   
   gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad);