diff --git a/ChangeLog b/ChangeLog
index 8317bb5f..ab506a14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@ Fernando Lopez-Lezcano
   Jackdmp changes log
 ---------------------------
 
+2008-05-22 Stephane Letz  <letz@grame.fr>
+
+	* Correct JackPort::ClearBuffer.
+
 2008-05-21 Stephane Letz  <letz@grame.fr>
 
 	* Correct JackEngine::PortUnRegister, JackEngine::ClientCloseAux and JackEngine::ClientDeactivate to correctly send notifications. 
diff --git a/common/JackPort.cpp b/common/JackPort.cpp
index acab6b68..b9b73351 100644
--- a/common/JackPort.cpp
+++ b/common/JackPort.cpp
@@ -267,7 +267,7 @@ int JackPort::UnsetAlias(const char* alias)
 void JackPort::ClearBuffer(jack_nframes_t frames)
 {
     const JackPortType* type = GetPortType(fTypeId);
-    (type->init)(fBuffer, BUFFER_SIZE_MAX * sizeof(float), frames);
+    (type->init)(fBuffer, frames * sizeof(float), frames);
 }
 
 void JackPort::MixBuffers(void** src_buffers, int src_count, jack_nframes_t buffer_size)