diff --git a/ChangeLog b/ChangeLog
index 5308c7315..4c1b60daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSDistributedLock.m: Standardise the path we are given for
+	the lock file.
+
 2008-09-18  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSThread.m: try to make firing of thread performers
diff --git a/Source/NSDistributedLock.m b/Source/NSDistributedLock.m
index 48cecf5f6..2ccce9b05 100644
--- a/Source/NSDistributedLock.m
+++ b/Source/NSDistributedLock.m
@@ -125,20 +125,20 @@ static NSFileManager	*mgr = nil;
   NSString	*lockDir;
   BOOL		isDirectory;
 
-  _lockPath = [aPath copy];
+  _lockPath = [[aPath stringByStandardizingPath] copy];
   _lockTime = nil;
 
   lockDir = [_lockPath stringByDeletingLastPathComponent];
   if ([mgr fileExistsAtPath: lockDir isDirectory: &isDirectory] == NO)
     {
-      NSLog(@"part of the path to the lock file '%@' is missing\n", _lockPath);
+      NSLog(@"part of the path to the lock file '%@' is missing\n", aPath);
       RELEASE(self);
       return nil;
     }
   if (isDirectory == NO)
     {
       NSLog(@"part of the path to the lock file '%@' is not a directory\n",
-		_lockPath);
+	_lockPath);
       RELEASE(self);
       return nil;
     }