diff --git a/ChangeLog b/ChangeLog
index ec843aac85..c74269b3ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-21  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/audiotestsrc/gstaudiotestsrc.c:
+	  Mark buffers as GAP,if volume is 0.0 and fix the previous logic.
+
 2008-02-20  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* ext/gnomevfs/gstgnomevfssink.c:
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index a63bf45cb9..7f41e13168 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -875,7 +875,8 @@ gst_audio_test_src_create (GstBaseSrc * basesrc, guint64 offset,
 
   src->process (src, GST_BUFFER_DATA (buf));
 
-  if (src->wave == G_UNLIKELY (GST_AUDIO_TEST_SRC_WAVE_SILENCE)) {
+  if (G_UNLIKELY ((src->wave == GST_AUDIO_TEST_SRC_WAVE_SILENCE)
+          || (src->volume == 0.0))) {
     GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_GAP);
   }