Index: src/OFData.m
==================================================================
--- src/OFData.m
+++ src/OFData.m
@@ -267,11 +267,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFIRI *IRI;
 
 	@try {
-		IRI = [OFIRI fileIRIWithPath: path];
+		IRI = [OFIRI fileIRIWithPath: path isDirectory: false];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 

Index: src/OFFileManager.m
==================================================================
--- src/OFFileManager.m
+++ src/OFFileManager.m
@@ -214,11 +214,12 @@
 - (OFIRI *)currentDirectoryIRI
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFIRI *ret;
 
-	ret = [OFIRI fileIRIWithPath: self.currentDirectoryPath];
+	ret = [OFIRI fileIRIWithPath: self.currentDirectoryPath
+			 isDirectory: true];
 	ret = [ret retain];
 
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
@@ -241,11 +242,12 @@
 - (OFFileAttributes)attributesOfItemAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFFileAttributes ret;
 
-	ret = [self attributesOfItemAtIRI: [OFIRI fileIRIWithPath: path]];
+	ret = [self attributesOfItemAtIRI: [OFIRI fileIRIWithPath: path
+						      isDirectory: false]];
 	ret = [ret retain];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
@@ -269,11 +271,11 @@
 - (void)setAttributes: (OFFileAttributes)attributes
 	 ofItemAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	[self setAttributes: attributes
-		ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
+		ofItemAtIRI: [OFIRI fileIRIWithPath: path isDirectory: false]];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
 - (bool)fileExistsAtIRI: (OFIRI *)IRI
@@ -293,11 +295,12 @@
 - (bool)fileExistsAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	bool ret;
 
-	ret = [self fileExistsAtIRI: [OFIRI fileIRIWithPath: path]];
+	ret = [self fileExistsAtIRI: [OFIRI fileIRIWithPath: path
+						isDirectory: false]];
 
 	objc_autoreleasePoolPop(pool);
 
 	return ret;
 }
@@ -320,11 +323,12 @@
 - (bool)directoryExistsAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	bool ret;
 
-	ret = [self directoryExistsAtIRI: [OFIRI fileIRIWithPath: path]];
+	ret = [self directoryExistsAtIRI: [OFIRI fileIRIWithPath: path
+						     isDirectory: true]];
 
 	objc_autoreleasePoolPop(pool);
 
 	return ret;
 }
@@ -437,21 +441,23 @@
 #ifdef OF_HAVE_FILES
 - (void)createDirectoryAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[self createDirectoryAtIRI: [OFIRI fileIRIWithPath: path]];
+	[self createDirectoryAtIRI: [OFIRI fileIRIWithPath: path
+					       isDirectory: true]];
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)createDirectoryAtPath: (OFString *)path
 		createParents: (bool)createParents
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[self createDirectoryAtIRI: [OFIRI fileIRIWithPath: path]
+	[self createDirectoryAtIRI: [OFIRI fileIRIWithPath: path
+					       isDirectory: true]
 		     createParents: createParents];
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
@@ -474,11 +480,12 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFArray OF_GENERIC(OFIRI *) *IRIs;
 	OFMutableArray OF_GENERIC(OFString *) *ret;
 
-	IRIs = [self contentsOfDirectoryAtIRI: [OFIRI fileIRIWithPath: path]];
+	IRIs = [self contentsOfDirectoryAtIRI: [OFIRI fileIRIWithPath: path
+							  isDirectory: true]];
 	ret = [OFMutableArray arrayWithCapacity: IRIs.count];
 
 	for (OFIRI *IRI in IRIs)
 		[ret addObject: IRI.lastPathComponent];
 
@@ -587,12 +594,14 @@
 
 - (void)copyItemAtPath: (OFString *)source toPath: (OFString *)destination
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	[self copyItemAtIRI: [OFIRI fileIRIWithPath: source]
-		      toIRI: [OFIRI fileIRIWithPath: destination]];
+	[self copyItemAtIRI: [OFIRI fileIRIWithPath: source
+					isDirectory: false]
+		      toIRI: [OFIRI fileIRIWithPath: destination
+					isDirectory: false]];
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
@@ -774,12 +783,14 @@
 
 #ifdef OF_HAVE_FILES
 - (void)moveItemAtPath: (OFString *)source toPath: (OFString *)destination
 {
 	void *pool = objc_autoreleasePoolPush();
-	[self moveItemAtIRI: [OFIRI fileIRIWithPath: source]
-		      toIRI: [OFIRI fileIRIWithPath: destination]];
+	[self moveItemAtIRI: [OFIRI fileIRIWithPath: source
+					isDirectory: false]
+		      toIRI: [OFIRI fileIRIWithPath: destination
+					isDirectory: false]];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
 - (void)moveItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
@@ -848,11 +859,12 @@
 
 #ifdef OF_HAVE_FILES
 - (void)removeItemAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
-	[self removeItemAtIRI: [OFIRI fileIRIWithPath: path]];
+	[self removeItemAtIRI: [OFIRI fileIRIWithPath: path
+					  isDirectory: false]];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
 - (void)linkItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
@@ -879,12 +891,14 @@
 
 #ifdef OF_FILE_MANAGER_SUPPORTS_LINKS
 - (void)linkItemAtPath: (OFString *)source toPath: (OFString *)destination
 {
 	void *pool = objc_autoreleasePoolPush();
-	[self linkItemAtIRI: [OFIRI fileIRIWithPath: source]
-		      toIRI: [OFIRI fileIRIWithPath: destination]];
+	[self linkItemAtIRI: [OFIRI fileIRIWithPath: source
+					isDirectory: false]
+		      toIRI: [OFIRI fileIRIWithPath: destination
+					isDirectory: false]];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
 - (void)createSymbolicLinkAtIRI: (OFIRI *)IRI
@@ -909,11 +923,12 @@
 #ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
 - (void)createSymbolicLinkAtPath: (OFString *)path
 	     withDestinationPath: (OFString *)target
 {
 	void *pool = objc_autoreleasePoolPush();
-	[self createSymbolicLinkAtIRI: [OFIRI fileIRIWithPath: path]
+	[self createSymbolicLinkAtIRI: [OFIRI fileIRIWithPath: path
+						  isDirectory: false]
 		  withDestinationPath: target];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
@@ -938,11 +953,12 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFData *ret;
 
 	ret = [self
 	    extendedAttributeDataForName: name
-			     ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
+			     ofItemAtIRI: [OFIRI fileIRIWithPath: path
+						     isDirectory: false]];
 	ret = [ret retain];
 
 	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
@@ -972,11 +988,12 @@
 		    ofItemAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	[self setExtendedAttributeData: data
 			       forName: name
-			   ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
+			   ofItemAtIRI: [OFIRI fileIRIWithPath: path
+						   isDirectory: false]];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
 - (void)removeExtendedAttributeForName: (OFString *)name
@@ -997,11 +1014,12 @@
 - (void)removeExtendedAttributeForName: (OFString *)name
 			  ofItemAtPath: (OFString *)path
 {
 	void *pool = objc_autoreleasePoolPush();
 	[self removeExtendedAttributeForName: name
-				 ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
+				 ofItemAtIRI: [OFIRI fileIRIWithPath: path
+							 isDirectory: false]];
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 @end
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -996,11 +996,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFIRI *IRI;
 
 	@try {
-		IRI = [OFIRI fileIRIWithPath: path];
+		IRI = [OFIRI fileIRIWithPath: path isDirectory: false];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}