diff --git a/ChangeLog b/ChangeLog
index 589ccf91c..773efd3ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2011-01-07  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSObject.m: Make zombie log message match current OSX.
+	* Source/NSURL.m: Fix -resourceSpecifier by removing incorrect
+	special handling for file URLs.
 
 2011-01-06  Fred Kiefer <FredKiefer@gmx.de>
 
diff --git a/Source/NSURL.m b/Source/NSURL.m
index 5351eaec7..df4f1031e 100644
--- a/Source/NSURL.m
+++ b/Source/NSURL.m
@@ -1770,12 +1770,19 @@ static unsigned	urlAlign;
   if (range.length > 0)
     {
       NSString *specifier;
-      /* MacOSX compatibility - file schemes just return the path (without
-         the "//") but everything else returns the whole specifier */
-      if ([[self scheme] isEqual: @"file"])
-        specifier = [_urlString substringFromIndex: NSMaxRange(range)];
+
+      /* MacOSX compatibility - in the case where there is no
+       * host in the URL, just return the path (without the "//").
+       * For all other cases we return the whole specifier.
+       */
+      if (nil == [self host])
+	{
+          specifier = [_urlString substringFromIndex: NSMaxRange(range)];
+	}
       else
-        specifier = [_urlString substringFromIndex: range.location+1];
+	{
+          specifier = [_urlString substringFromIndex: range.location+1];
+	}
       return specifier;
     }
   else