@@ -19,12 +19,13 @@
 #include <stdlib.h>
 #include <string.h>
 
 #import "OFURL.h"
 #import "OFURL+Private.h"
-#import "OFString.h"
 #import "OFArray.h"
+#import "OFNumber.h"
+#import "OFString.h"
 #import "OFXMLElement.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfMemoryException.h"
@@ -87,11 +88,14 @@
 			     exceptionWithRequestedSize:
 			     [string UTF8StringLength]];
 
 		UTF8String = UTF8String2;
 
-		if ((tmp = strstr(UTF8String, "://")) == NULL)
+		if ((tmp = strchr(UTF8String, ':')) == NULL)
+			@throw [OFInvalidFormatException exception];
+
+		if (strncmp(tmp, "://", 3) != 0)
 			@throw [OFInvalidFormatException exception];
 
 		for (tmp2 = UTF8String; tmp2 < tmp; tmp2++)
 			*tmp2 = of_ascii_tolower(*tmp2);
 
@@ -99,18 +103,10 @@
 		    initWithUTF8String: UTF8String
 				length: tmp - UTF8String];
 
 		UTF8String = tmp + 3;
 
-		if ([_scheme isEqual: @"file"]) {
-			_path = [[OFString alloc]
-			    initWithUTF8String: UTF8String];
-
-			objc_autoreleasePoolPop(pool);
-			return self;
-		}
-
 		if ((tmp = strchr(UTF8String, '/')) != NULL) {
 			*tmp = '\0';
 			tmp++;
 		}
 
@@ -149,25 +145,18 @@
 			portString = [OFString stringWithUTF8String: tmp2];
 
 			if ([portString decimalValue] > 65535)
 				@throw [OFInvalidFormatException exception];
 
-			_port = [portString decimalValue];
+			_port = [[OFNumber alloc] initWithUInt16:
+			    (uint16_t)[portString decimalValue]];
 
 			objc_autoreleasePoolPop(pool2);
-		} else {
+		} else
 			_host = [[OFString alloc]
 			    initWithUTF8String: UTF8String];
 
-			if ([_scheme isEqual: @"http"])
-				_port = 80;
-			else if ([_scheme isEqual: @"https"])
-				_port = 443;
-			else if ([_scheme isEqual: @"ftp"])
-				_port = 21;
-		}
-
 		if ((UTF8String = tmp) != NULL) {
 			if ((tmp = strchr(UTF8String, '#')) != NULL) {
 				*tmp = '\0';
 
 				_fragment = [[OFString alloc]
@@ -220,11 +209,11 @@
 		void *pool = objc_autoreleasePoolPush();
 		char *tmp;
 
 		_scheme = [URL->_scheme copy];
 		_host = [URL->_host copy];
-		_port = URL->_port;
+		_port = [URL->_port copy];
 		_user = [URL->_user copy];
 		_password = [URL->_password copy];
 
 		if ((UTF8String2 = of_strdup([string UTF8String])) == NULL)
 			@throw [OFOutOfMemoryException
@@ -302,10 +291,11 @@
 
 - (void)dealloc
 {
 	[_scheme release];
 	[_host release];
+	[_port release];
 	[_user release];
 	[_password release];
 	[_path release];
 	[_parameters release];
 	[_query release];
@@ -321,31 +311,28 @@
 	if (![object isKindOfClass: [OFURL class]])
 		return false;
 
 	URL = object;
 
-	if (![URL->_scheme isEqual: _scheme])
+	if (URL->_scheme != _scheme && ![URL->_scheme isEqual: _scheme])
 		return false;
-	if (![URL->_host isEqual: _host])
+	if (URL->_host != _host && ![URL->_host isEqual: _host])
 		return false;
-	if (URL->_port != _port)
+	if (URL->_port != _port && ![URL->_port isEqual: _port])
 		return false;
 	if (URL->_user != _user && ![URL->_user isEqual: _user])
 		return false;
-	if (URL->_password != _password &&
-	    ![URL->_password isEqual: _password])
+	if (URL->_password != _password && ![URL->_password isEqual: _password])
 		return false;
-	if (![URL->_path isEqual: _path])
+	if (URL->_path != _path && ![URL->_path isEqual: _path])
 		return false;
 	if (URL->_parameters != _parameters &&
 	    ![URL->_parameters isEqual: _parameters])
 		return false;
-	if (URL->_query != _query &&
-	    ![URL->_query isEqual: _query])
+	if (URL->_query != _query && ![URL->_query isEqual: _query])
 		return false;
-	if (URL->_fragment != _fragment &&
-	    ![URL->_fragment isEqual: _fragment])
+	if (URL->_fragment != _fragment && ![URL->_fragment isEqual: _fragment])
 		return false;
 
 	return true;
 }
 
@@ -355,12 +342,11 @@
 
 	OF_HASH_INIT(hash);
 
 	OF_HASH_ADD_HASH(hash, [_scheme hash]);
 	OF_HASH_ADD_HASH(hash, [_host hash]);
-	OF_HASH_ADD(hash, (_port & 0xFF00) >> 8);
-	OF_HASH_ADD(hash, _port & 0xFF);
+	OF_HASH_ADD_HASH(hash, [_port hash]);
 	OF_HASH_ADD_HASH(hash, [_user hash]);
 	OF_HASH_ADD_HASH(hash, [_password hash]);
 	OF_HASH_ADD_HASH(hash, [_path hash]);
 	OF_HASH_ADD_HASH(hash, [_parameters hash]);
 	OF_HASH_ADD_HASH(hash, [_query hash]);
@@ -379,11 +365,11 @@
 - (OFString *)host
 {
 	return _host;
 }
 
-- (uint16_t)port
+- (OFNumber *)port
 {
 	return _port;
 }
 
 - (OFString *)user
@@ -448,30 +434,19 @@
 	OFMutableString *ret = [OFMutableString string];
 	void *pool = objc_autoreleasePoolPush();
 
 	[ret appendFormat: @"%@://", _scheme];
 
-	if ([_scheme isEqual: @"file"]) {
-		if (_path != nil)
-			[ret appendString: _path];
-
-		objc_autoreleasePoolPop(pool);
-		return ret;
-	}
-
 	if (_user != nil && _password != nil)
 		[ret appendFormat: @"%@:%@@", _user, _password];
 	else if (_user != nil)
 		[ret appendFormat: @"%@@", _user];
 
 	if (_host != nil)
 		[ret appendString: _host];
-
-	if (!(([_scheme isEqual: @"http"] && _port == 80) ||
-	    ([_scheme isEqual: @"https"] && _port == 443) ||
-	    ([_scheme isEqual: @"ftp"] && _port == 21)))
-		[ret appendFormat: @":%u", _port];
+	if (_port != nil)
+		[ret appendFormat: @":%@", _port];
 
 	if (_path != nil) {
 		if (![_path hasPrefix: @"/"])
 			@throw [OFInvalidFormatException exception];