diff --git a/ChangeLog b/ChangeLog
index 5ca1d5bc9..7e25a961e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-08  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSThread.m: Fix race condition firing perform holder.
+	Fix supplied by {hilip Derrin.
+
 2002-12-05  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSUserDefaults.m: Fix uninitialised local variable 'locale'
diff --git a/Source/NSThread.m b/Source/NSThread.m
index f65141a8c..c75f0bfd2 100644
--- a/Source/NSThread.m
+++ b/Source/NSThread.m
@@ -786,9 +786,11 @@ static NSDate *theFuture;
     }
   else
     {
+      NSConditionLock	*l = lock;
+
       [lock lock];
-      [lock unlockWithCondition: 1];
       lock = nil;
+      [l unlockWithCondition: 1];
     }
 }
 @end