@@ -21,15 +21,16 @@
 
 #import "OFHTTPServer.h"
 #import "OFData.h"
 #import "OFDate.h"
 #import "OFDictionary.h"
-#import "OFURL.h"
 #import "OFHTTPRequest.h"
 #import "OFHTTPResponse.h"
+#import "OFNumber.h"
 #import "OFTCPSocket.h"
 #import "OFTimer.h"
+#import "OFURL.h"
 
 #import "OFAlreadyConnectedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFNotOpenException.h"
@@ -652,11 +653,12 @@
 	}
 
 	URL = [OFMutableURL URL];
 	[URL setScheme: @"http"];
 	[URL setHost: _host];
-	[URL setPort: _port];
+	if (_port != 80)
+		[URL setPort: [OFNumber numberWithUInt16: _port]];
 
 	if ((pos = [_path rangeOfString: @"?"].location) != OF_NOT_FOUND) {
 		OFString *path, *query;
 
 		path = [_path substringWithRange: of_range(0, pos)];