diff --git a/ChangeLog b/ChangeLog
index 7c78b8b01..a373762d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-16  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSURL.m:  ([-explode]) bugfix for parsing username/password
+	provided by mark@brainstorm.co.uk
+
 2000-11-16  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSTcpPort.m: Altered all GSTcpHandle debug output to include
diff --git a/Source/NSURL.m b/Source/NSURL.m
index ebf354a0d..5f5e32340 100644
--- a/Source/NSURL.m
+++ b/Source/NSURL.m
@@ -358,7 +358,7 @@ NSString	*NSURLPartKey_query = @"query";
 		{
 		  NSString	*sub;
 
-		  sub = [userPassword substringToIndex:
+		  sub = [userPassword substringFromIndex:
 		    range.location + 1];
 		  [elements setObject: sub
 			       forKey: NSURLPartKey_password];