diff --git a/ChangeLog b/ChangeLog
index 2bca3450..3038df4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@ David Garcia Garzon
 2010-11-17 Stephane Letz  <letz@grame.fr>
 
 	* ALSA backend : suspend/resume handling (jack1 r4075).
+	* Correct dummy driver.
 
 2010-11-05 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackDummyDriver.cpp b/common/JackDummyDriver.cpp
index 5f31cb88..c4133118 100644
--- a/common/JackDummyDriver.cpp
+++ b/common/JackDummyDriver.cpp
@@ -56,6 +56,12 @@ int JackDummyDriver::Open(jack_nframes_t buffer_size,
         fEngineControl->fPeriod = 0;
         fEngineControl->fComputation = 500 * 1000;
         fEngineControl->fConstraint = 500 * 1000;
+        int buffer_size = (fWaitTime * fEngineControl->fSampleRate) / 1000000.0f;
+        if (buffer_size > BUFFER_SIZE_MAX) {
+            buffer_size = BUFFER_SIZE_MAX;
+            jack_error("Buffer size set to %d ", BUFFER_SIZE_MAX);
+        }
+        SetBufferSize(buffer_size);
         return 0;
     } else {
         return -1;