@@ -543,16 +543,10 @@
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
-	if ([self directoryExistsAtPath: destination]) {
-		OFArray *components = [OFArray arrayWithObjects:
-		    destination, [source lastPathComponent], nil];
-		destination = [OFString pathWithComponents: components];
-	}
-
 #ifndef _WIN32
 	if (lstat([destination
 		cStringWithEncoding: OF_STRING_ENCODING_NATIVE], &s) == 0) {
 #else
 	if (_wstat([destination UTF16String], &s) == 0) {
@@ -679,16 +673,10 @@
 	if (source == nil || destination == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	pool = objc_autoreleasePoolPush();
 
-	if ([self directoryExistsAtPath: destination]) {
-		OFArray *components = [OFArray arrayWithObjects:
-		    destination, [source lastPathComponent], nil];
-		destination = [OFString pathWithComponents: components];
-	}
-
 #ifndef _WIN32
 	if (rename([source cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 	    [destination cStringWithEncoding: OF_STRING_ENCODING_NATIVE]))
 #else
 	if (_wrename([source UTF16String], [destination UTF16String]))