diff --git a/ChangeLog b/ChangeLog
index c45de9a0f..4612edc6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-25  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSUserDefaults.m: fix failure to unlock thread lock when
+	unabel to obtain filesystem lock.
+
 2007-01-23  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSObject.m ([NSObject +initialize]): Apply BSD FPU fix
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index 467e1148d..5bc99b330 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -1454,6 +1454,7 @@ static BOOL isLocked = NO;
   
   if ([self lockDefaultsFile: &wasLocked] == NO)
     {
+      [_lock unlock];
       return NO;
     }