@@ -287,11 +287,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
 
-- (uint16_t)bindToHost: (OFString *)host port: (uint16_t)port
+- (OFSocketAddress)bindToHost: (OFString *)host port: (uint16_t)port
 {
 	const int one = 1;
 	void *pool = objc_autoreleasePoolPush();
 	OFData *socketAddresses;
 	OFSocketAddress address;
@@ -359,14 +359,12 @@
 
 			OFSocketAddressSetIPPort(&address, rnd);
 
 			if ((ret = bind(_socket,
 			    (struct sockaddr *)&address.sockaddr,
-			    address.length)) == 0) {
-				port = rnd;
+			    address.length)) == 0)
 				break;
-			}
 
 			if (OFSocketErrNo() != EADDRINUSE) {
 				int errNo = OFSocketErrNo();
 
 				closesocket(_socket);
@@ -380,15 +378,10 @@
 			}
 		}
 	}
 #endif
 
-	objc_autoreleasePoolPop(pool);
-
-	if (port > 0)
-		return port;
-
 #if !defined(OF_HPUX) && !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 	memset(&address, 0, sizeof(address));
 
 	address.length = (socklen_t)sizeof(address.sockaddr);
 	if (OFGetSockName(_socket, (struct sockaddr *)&address.sockaddr,
@@ -404,14 +397,16 @@
 								  errNo: errNo];
 	}
 
 	switch (((struct sockaddr *)&address.sockaddr)->sa_family) {
 	case AF_INET:
-		return OFFromBigEndian16(address.sockaddr.in.sin_port);
+		address.family = OFSocketAddressFamilyIPv4;
+		break;
 # ifdef OF_HAVE_IPV6
 	case AF_INET6:
-		return OFFromBigEndian16(address.sockaddr.in6.sin6_port);
+		address.family = OFSocketAddressFamilyIPv6;
+		break;
 # endif
 	default:
 		closesocket(_socket);
 		_socket = OFInvalidSocketHandle;
 
@@ -419,18 +414,15 @@
 		    exceptionWithHost: host
 				 port: port
 			       socket: self
 				errNo: EAFNOSUPPORT];
 	}
-#else
-	closesocket(_socket);
-	_socket = OFInvalidSocketHandle;
-	@throw [OFBindIPSocketFailedException exceptionWithHost: host
-							   port: port
-							 socket: self
-							  errNo: EADDRNOTAVAIL];
 #endif
+
+	objc_autoreleasePoolPop(pool);
+
+	return address;
 }
 
 #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 - (void)setSendsKeepAlives: (bool)sendsKeepAlives
 {