diff --git a/ChangeLog b/ChangeLog
index 25550c9332..38816751b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/volume/gstvolume.c:
+	  Allow buffer-frames=0.
+
 2004-11-12 Iain <iaingnome@gmail.com>
 
 	* configure.ac: Check for polypaudio
diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index b375643278..89dd25c4c7 100644
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -74,7 +74,7 @@ static GstStaticPadTemplate volume_sink_factory =
         "channels = (int) [ 1, MAX ], "
         "endianness = (int) BYTE_ORDER, "
         "width = (int) 32, "
-        "buffer-frames = (int) [ 1, MAX]; "
+        "buffer-frames = (int) [ 0, MAX]; "
         "audio/x-raw-int, "
         "channels = (int) [ 1, MAX ], "
         "rate = (int) [ 1,  MAX ], "
@@ -90,7 +90,7 @@ static GstStaticPadTemplate volume_src_factory = GST_STATIC_PAD_TEMPLATE ("src",
         "channels = (int) [ 1, MAX ], "
         "endianness = (int) BYTE_ORDER, "
         "width = (int) 32, "
-        "buffer-frames = (int) [ 1, MAX]; "
+        "buffer-frames = (int) [ 0, MAX]; "
         "audio/x-raw-int, "
         "channels = (int) [ 1, MAX ], "
         "rate = (int) [ 1,  MAX ], "