diff --git a/ChangeLog b/ChangeLog
index 63236d657..3a9364c75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-08  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSURL.m:
+	Return nil for -path if initialised with empty string ... OSX compat.
+
 2010-06-08  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSFFIInvocation.m:
diff --git a/Source/NSURL.m b/Source/NSURL.m
index 8f2b0ba27..e6d004e0b 100644
--- a/Source/NSURL.m
+++ b/Source/NSURL.m
@@ -1082,6 +1082,10 @@ static unsigned	urlAlign;
        * Store the path.
        */
       buf->path = start;
+      if (0 == base && '\0' == *buf->path && NO == buf->pathIsAbsolute)
+	{
+	  buf->hasNoPath = YES;
+	}
       if (legal(buf->path, reserved) == NO)
 	{
 	  [NSException raise: NSInvalidArgumentException