@@ -104,11 +104,11 @@
 			 service: service];
 	}
 
 	if ((se = getservbyname([service cString], "TCP")) != NULL)
 		port = se->s_port;
-	else if ((port = htons(atoi([service cString]))) == 0) {
+	else if ((port = OF_BSWAP16_IF_LE(atoi([service cString]))) == 0) {
 		[mutex unlock];
 		@throw [OFAddressTranslationFailedException
 		    newWithClass: isa
 			    node: node
 			 service: service];
@@ -210,11 +210,11 @@
 			 service: service];
 	}
 
 	if ((se = getservbyname([service cString], "TCP")) != NULL)
 		port = se->s_port;
-	else if ((port = htons(atoi([service cString]))) == 0) {
+	else if ((port = OF_BSWAP16_IF_LE(atoi([service cString]))) == 0) {
 		[mutex unlock];
 		@throw [OFAddressTranslationFailedException
 		    newWithClass: isa
 			    node: node
 			 service: service];