@@ -20,10 +20,13 @@
 #include <string.h>
 
 #import "OFURL.h"
 #import "OFURL+Private.h"
 #import "OFArray.h"
+#ifdef OF_HAVE_FILES
+# import "OFFileManager.h"
+#endif
 #import "OFNumber.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
 
 #import "OFInvalidArgumentException.h"
@@ -46,24 +49,35 @@
 {
 	return [[[self alloc] initWithString: string
 			       relativeToURL: URL] autorelease];
 }
 
+#ifdef OF_HAVE_FILES
 + (instancetype)fileURLWithPath: (OFString *)path
 {
-	OFMutableURL *URL = [OFMutableURL URL];
 	void *pool = objc_autoreleasePoolPush();
+	OFFileManager *fileManager = [OFFileManager defaultManager];
+	OFURL *currentDirectoryURL, *URL;
 
-	[URL setScheme: @"file"];
-	[URL setPath: [[path pathComponents] componentsJoinedByString: @"/"]];
+	if (![path hasSuffix: OF_PATH_DELIMITER_STRING] &&
+	    [fileManager directoryExistsAtPath: path])
+		path = [path stringByAppendingString: @"/"];
 
-	[URL makeImmutable];
+# if OF_PATH_DELIMITER != '/'
+	path = [[path pathComponents] componentsJoinedByString: @"/"];
+# endif
+
+	currentDirectoryURL =
+	    [[OFFileManager defaultManager] currentDirectoryURL];
+	URL = [[OFURL alloc] initWithString: path
+			      relativeToURL: currentDirectoryURL];
 
 	objc_autoreleasePoolPop(pool);
 
-	return URL;
+	return [URL autorelease];
 }
+#endif
 
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }