diff --git a/ChangeLog b/ChangeLog
index 91b7049e..709f4c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@ Michael Voigt
   Jackdmp changes log
 ---------------------------
 
+2009-01-17 Stephane Letz  <letz@grame.fr>
+
+	* JackMessageBuffer was using thread "Stop" scheme in destructor, now use the safer thread "Kill" way. 
+
 2009-01-14 Stephane Letz  <letz@grame.fr>
 
 	* Cleanup server starting code for clients directly linked with libjackserver.so.
diff --git a/common/JackMessageBuffer.cpp b/common/JackMessageBuffer.cpp
index 4d202bee..f558fdc6 100644
--- a/common/JackMessageBuffer.cpp
+++ b/common/JackMessageBuffer.cpp
@@ -1,11 +1,3 @@
-/*
- * messagebuffer.h -- realtime-safe message interface for jackd.
- *
- *  This function is included in libjack so backend drivers can use
- *  it, *not* for external client processes.  The VERBOSE() and
- *  MESSAGE() macros are realtime-safe.
- */
-
 /*
  *  Copyright (C) 2004 Rui Nuno Capela, Steve Harris
  *  Copyright (C) 2008 Nedko Arnaudov
@@ -49,9 +41,7 @@ JackMessageBuffer::~JackMessageBuffer()
     } else {
         jack_info("no message buffer overruns"); 
     }
-    fThread.SetStatus(JackThread::kIdle);
-    fSignal.Signal();
-    fThread.Stop();
+    fThread.Kill();
     Flush();
 }