diff --git a/ChangeLog b/ChangeLog
index f4db0222c..f0c3a1ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-14  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSString.m: ([stringByAppendingPathComponent:]) recalculate
+        root of patch correctly before stripping trailing separators.
+
 2013-01-13  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/Foundation/NSDistributedNotificationCenter.h,
diff --git a/Source/NSString.m b/Source/NSString.m
index 8147b549a..8dff3218f 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -3837,6 +3837,7 @@ static NSFileManager *fm = nil;
     {
       [aString getCharacters: buf range: ((NSRange){0, aLength})];
       length = aLength;
+      root = rootOf(aString, aLength);
     }
   else
     {