diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0f1d925a0..01bdd860a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-30  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* thread.cc: Mark pthread_rwlock_timedrdlock and
+	pthread_rwlock_timedwrlock as not yet implemented in the list of
+	cancellation points.
+
 2011-12-24  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
 	* fhandler_dsp.cc (fhandler_dev_dsp::fhandler_dev_dsp): Set up device.
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 1edd566fb..9ca467577 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -810,8 +810,8 @@ pthread::cancel ()
       psiginfo ()
       psignal ()
       pthread_rwlock_rdlock ()
-      pthread_rwlock_timedrdlock ()
-      pthread_rwlock_timedwrlock ()
+    o pthread_rwlock_timedrdlock ()
+    o pthread_rwlock_timedwrlock ()
       pthread_rwlock_wrlock ()
       putc ()
       putc_unlocked ()