@@ -289,14 +289,23 @@
 
 - (OFURL *)currentDirectoryURL
 {
 	OFMutableURL *URL = [OFMutableURL URL];
 	void *pool = objc_autoreleasePoolPush();
+	OFString *path;
 
 	[URL setScheme: @"file"];
-	[URL setPath: [[[self currentDirectoryPath] pathComponents]
-	    componentsJoinedByString: @"/"]];
+
+#if OF_PATH_DELIMITER != '/'
+	path = [[[self currentDirectoryPath] pathComponents]
+	    componentsJoinedByString: @"/"];
+#else
+	path = [self currentDirectoryPath];
+#endif
+
+	[URL setPath: [path stringByAppendingString: @"/"]];
+
 	[URL makeImmutable];
 
 	objc_autoreleasePoolPop(pool);
 
 	return URL;