diff --git a/ChangeLog b/ChangeLog
index abe1f20a1..c570a74f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSString.m: ([sttringByAppendingPathComponent:]) Fix bug
+	eliding multiple slashes in path.
+
 2005-04-02  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSTask.m: Fix missing nul terminator to arguments under win32
diff --git a/Source/NSString.m b/Source/NSString.m
index faf800272..919249a51 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -3552,6 +3552,7 @@ static NSFileManager *fm = nil;
 		      buf[pos-1] = buf[pos];
 		    }
 		  length--;
+	          aLength--;
 		}
 	      buf[aLength] = '/';	// Standardise
 	    }