diff --git a/ChangeLog b/ChangeLog
index a510629896..d8d6e5785a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-18  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* ext/pulse/pulsesink.c: (gst_pulsesink_prepare):
+	* ext/pulse/pulsesrc.c: (gst_pulsesrc_prepare):
+	The bytes_per_sample and silence_sample fields of the GstRingBufferSpec
+	are already filled with the correct values by
+	gst_ring_buffer_parse_caps() so there's no need to set them again
+	with wrong values.
+
 2008-08-16  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes_pull),
diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index f80667d72b..b021334111 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -584,16 +584,14 @@ gst_pulsesink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
   if (!pulsesink->context
       || pa_context_get_state (pulsesink->context) != PA_CONTEXT_READY) {
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Bad context state: %s",
-            pulsesink->
-            context ? pa_strerror (pa_context_errno (pulsesink->context)) :
-            NULL), (NULL));
+            pulsesink->context ? pa_strerror (pa_context_errno (pulsesink->
+                    context)) : NULL), (NULL));
     goto unlock_and_fail;
   }
 
   if (!(pulsesink->stream = pa_stream_new (pulsesink->context,
-              pulsesink->
-              stream_name ? pulsesink->stream_name : "Playback Stream",
-              &pulsesink->sample_spec,
+              pulsesink->stream_name ? pulsesink->
+              stream_name : "Playback Stream", &pulsesink->sample_spec,
               gst_pulse_gst_to_channel_map (&channel_map, spec)))) {
     GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED,
         ("Failed to create stream: %s",
@@ -636,9 +634,6 @@ gst_pulsesink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
 
   pa_threaded_mainloop_unlock (pulsesink->mainloop);
 
-  spec->bytes_per_sample = pa_frame_size (&pulsesink->sample_spec);
-  memset (spec->silence_sample, 0, spec->bytes_per_sample);
-
 #if 0
   gst_pulsesink_set_volume (pulsesink, pulsesink->volume);
 #endif
diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index 59d2c24d10..9302ca3aa1 100644
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -509,8 +509,9 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
   if (!pulsesrc->context
       || pa_context_get_state (pulsesrc->context) != PA_CONTEXT_READY) {
     GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED, ("Bad context state: %s",
-            pulsesrc->context ? pa_strerror (pa_context_errno (pulsesrc->
-                    context)) : NULL), (NULL));
+            pulsesrc->
+            context ? pa_strerror (pa_context_errno (pulsesrc->context)) :
+            NULL), (NULL));
     goto unlock_and_fail;
   }
 
@@ -554,9 +555,6 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec)
 
   pa_threaded_mainloop_unlock (pulsesrc->mainloop);
 
-  spec->bytes_per_sample = pa_frame_size (&pulsesrc->sample_spec);
-  memset (spec->silence_sample, 0, spec->bytes_per_sample);
-
   return TRUE;
 
 unlock_and_fail: