diff --git a/THANKS b/THANKS
index 6d464d6f6..a7e719659 100644
--- a/THANKS
+++ b/THANKS
@@ -45,6 +45,7 @@ For fixes or providing information which led to a fix:
         Richard Kim
           Bruce Korb
        Matthias Köppe
+           Matt Kraai
            Jeff Long
         Han-Wen Nienhuys
             Jan Nieuwenhuizen
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index da86bea4a..5c817f76b 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* threads.c (do_unlock): Renamed from "unlock", which is defined
+	in unistd.h on QNX.  (Reported by Matt Kraai.)
+
 2006-03-04  Kevin Ryde  <user42@zip.com.au>
 
 	* deprecated.c (scm_i_defer_ints_etc): Show SCM_DEFER_INTS in message,
diff --git a/libguile/threads.c b/libguile/threads.c
index 76afa4654..7d25e4916 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1397,7 +1397,7 @@ scm_pthread_mutex_lock (scm_i_pthread_mutex_t *mutex)
 }
 
 static void
-unlock (void *data)
+do_unlock (void *data)
 {
   scm_i_pthread_mutex_unlock ((scm_i_pthread_mutex_t *)data);
 }
@@ -1406,7 +1406,7 @@ void
 scm_dynwind_pthread_mutex_lock (scm_i_pthread_mutex_t *mutex)
 {
   scm_i_scm_pthread_mutex_lock (mutex);
-  scm_dynwind_unwind_handler (unlock, mutex, SCM_F_WIND_EXPLICITLY);
+  scm_dynwind_unwind_handler (do_unlock, mutex, SCM_F_WIND_EXPLICITLY);
 }
 
 int