diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 39b542a76449154e20dcc31033b44dbb6c5dd1e8..9d60804091803abd75b027a960162a42b3870f32 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-08  Tom Tromey  <tromey@cygnus.com>
+
+	* include/posix-threads.h (_Jv_PthreadCheckMonitor): Changed test
+	in __m_count case.
+
 1999-09-07  Tom Tromey  <tromey@cygnus.com>
 
 	* posix-threads.cc (_Jv_CondWait): pthread_ calls return error
@@ -6,7 +11,7 @@
 	* posix-threads.cc (_Jv_CondWait): Check `errno' against EINTR,
 	not `r'.  Changed `done_sleeping' to a `bool'.
 
-1999-09-07  Matt Welsh <mdw@cs.berkeley.edu
+1999-09-07  Matt Welsh <mdw@cs.berkeley.edu>
 
 	* libjava/posix-threads.cc: Added _Jv_ThreadDataKey.
 	Added FLAG_INTERRUPTED to indicate that a thread was interrupted
diff --git a/libjava/THANKS b/libjava/THANKS
index 1a75a6d5e57e1da9a21db6feef6ccee62a623add..f60dc8fe20a3e4f6a08e1cda22acf2a56c9f5aff 100644
--- a/libjava/THANKS
+++ b/libjava/THANKS
@@ -11,6 +11,7 @@ Franz Sirl		Franz.Sirl-kernel@lauterbach.com
 Geoff Berry		gcb@gnu.org
 Gilles Zunino		Gilles.Zunino@hei.fr
 Kresten Krab Thorup	krab@gnu.org
+Matt Welsh		mdw@cs.berkeley.edu
 Per Bothner		per@bothner.com
 Rainer Orth		ro@TechFak.Uni-Bielefeld.DE
 Stu Grossman		grossman@juniper.net
diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h
index cc8493a4f3ed671feda44c836aa0937ee5f71197..00a918fab279764feeae324cc8d4e261b94838b7 100644
--- a/libjava/include/posix-threads.h
+++ b/libjava/include/posix-threads.h
@@ -114,7 +114,7 @@ _Jv_PthreadCheckMonitor (_Jv_Mutex_t *mu)
   // On Linux we exploit knowledge of the implementation.
   int r = pmu->m_count == 1;
 #elif defined (PTHREAD_MUTEX_HAVE___M_COUNT)
-  int r = pmu->__m_count == 1;
+  int r = (pthread_t) pmu->__m_owner == pthread_self ();
 #else
   int r = mu->count == 0;
 #endif