@@ -357,11 +357,11 @@
 	OFMutableString *path;
 	size_t pos;
 
 	@try {
 		OFString *version = [line
-		    substringWithRange: OFRangeMake(line.length - 9, 9)];
+		    substringWithRange: OFMakeRange(line.length - 9, 9)];
 		OFUnichar tmp;
 
 		if (![version hasPrefix: @" HTTP/1."])
 			return [self sendErrorAndClose: 505];
 
@@ -384,11 +384,11 @@
 	} @catch (OFInvalidArgumentException *e) {
 		return [self sendErrorAndClose: 405];
 	}
 
 	@try {
-		OFRange range = OFRangeMake(pos + 1, line.length - pos - 10);
+		OFRange range = OFMakeRange(pos + 1, line.length - pos - 10);
 
 		path = [[[line substringWithRange:
 		    range] mutableCopy] autorelease];
 	} @catch (OFOutOfRangeException *e) {
 		return [self sendErrorAndClose: 400];