@@ -168,10 +168,13 @@
 			if ([portString decimalValue] > 65535)
 				@throw [OFInvalidFormatException
 				    exceptionWithClass: [self class]];
 
 			port = [portString decimalValue];
+
+			if (port == 0)
+				port = 80;
 
 			objc_autoreleasePoolPop(pool);
 		} else {
 			host = [[OFString alloc]
 			    initWithUTF8String: UTF8String];