diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 14a52ed0b..1731086bb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Christopher Faylor  <cgf@timesys.com>
+
+	* thread.cc (pthread_mutex::_lock): Use cancelable_wait rather than
+	WaitForSingleObject.
+
 2005-06-09  Christopher Faylor  <cgf@timesys.com>
 
 	* cygwin.sc: Place .cygwin_dll_common in a more sensible spot.
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 1ba384794..f1714d2bb 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1554,7 +1554,7 @@ pthread_mutex::_lock (pthread_t self)
     }
   else
     {
-      WaitForSingleObject (win32_obj_id, INFINITE);
+      cancelable_wait (win32_obj_id, INFINITE, false, cw_sig_resume);
       set_owner (self);
     }