Index: src/OFKernelEventObserver.m
==================================================================
--- src/OFKernelEventObserver.m
+++ src/OFKernelEventObserver.m
@@ -60,10 +60,15 @@
 	QUEUE_REMOVE = 1,
 	QUEUE_READ = 0,
 	QUEUE_WRITE = 2
 };
 #define QUEUE_ACTION (QUEUE_ADD | QUEUE_REMOVE)
+
+#ifdef __wii__
+/* FIXME: Add a port registry for Wii */
+static uint16_t freePort = 65535;
+#endif
 
 @implementation OFKernelEventObserver
 + (void)initialize
 {
 	if (self != [OFKernelEventObserver class])
@@ -126,12 +131,13 @@
 		_cancelAddr.sin_family = AF_INET;
 		_cancelAddr.sin_port = 0;
 		_cancelAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
 
 # ifdef __wii__
+		_cancelAddr.sin_len = 8;
 		/* The Wii does not accept port 0 as "choose any free port" */
-		_cancelAddr.sin_port = 65535;
+		_cancelAddr.sin_port = freePort--;
 # endif
 
 		if (bind(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
 		    sizeof(_cancelAddr)))
 			@throw [OFInitializationFailedException
@@ -353,12 +359,17 @@
 - (void)cancel
 {
 #ifdef OF_HAVE_PIPE
 	OF_ENSURE(write(_cancelFD[1], "", 1) > 0);
 #else
-	OF_ENSURE(sendto(_cancelFD[1], "", 1, 0, (struct sockaddr*)&_cancelAddr,
-	    sizeof(_cancelAddr)) > 0);
+# ifndef __wii__
+	OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
+	    (struct sockaddr*)&_cancelAddr, sizeof(_cancelAddr)) > 0);
+# else
+	OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
+	    (struct sockaddr*)&_cancelAddr, 8) > 0);
+# endif
 #endif
 }
 
 - (void)OF_processReadBuffers
 {

Index: src/OFKernelEventObserver_poll.m
==================================================================
--- src/OFKernelEventObserver_poll.m
+++ src/OFKernelEventObserver_poll.m
@@ -185,11 +185,16 @@
 
 		if (FDs[i].revents & POLLIN) {
 			if (FDs[i].fd == _cancelFD[0]) {
 				char buffer;
 
+#ifdef OF_HAVE_PIPE
 				OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
+#else
+				OF_ENSURE(recvfrom(_cancelFD[0], &buffer, 1,
+				    0, NULL, NULL) == 1);
+#endif
 				FDs[i].revents = 0;
 
 				continue;
 			}
 

Index: src/OFKernelEventObserver_select.m
==================================================================
--- src/OFKernelEventObserver_select.m
+++ src/OFKernelEventObserver_select.m
@@ -166,11 +166,11 @@
 								 errNo: errno];
 
 	if (FD_ISSET(_cancelFD[0], &readFDs)) {
 		char buffer;
 
-#ifndef _WIN32
+#ifdef OF_HAVE_PIPE
 		OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
 #else
 		OF_ENSURE(recvfrom(_cancelFD[0], &buffer, 1, 0, NULL,
 		    NULL) == 1);
 #endif

Index: src/OFUDPSocket.m
==================================================================
--- src/OFUDPSocket.m
+++ src/OFUDPSocket.m
@@ -187,13 +187,18 @@
 	if (address1->address.ss_family != address2->address.ss_family)
 		return false;
 
 	switch (address1->address.ss_family) {
 	case AF_INET:
+#ifndef __wii__
 		if (address1->length < sizeof(struct sockaddr_in) ||
 		    address2->length < sizeof(struct sockaddr_in))
 			@throw [OFInvalidArgumentException exception];
+#else
+		if (address1->length < 8 || address2->length < 8)
+			@throw [OFInvalidArgumentException exception];
+#endif
 
 		sin_1 = (struct sockaddr_in*)&address1->address;
 		sin_2 = (struct sockaddr_in*)&address2->address;
 
 		if (sin_1->sin_port != sin_2->sin_port)
@@ -240,12 +245,17 @@
 
 	hash += address->address.ss_family;
 
 	switch (address->address.ss_family) {
 	case AF_INET:
+#ifndef __wii__
 		if (address->length < sizeof(struct sockaddr_in))
 			@throw [OFInvalidArgumentException exception];
+#else
+		if (address->length < 8)
+			@throw [OFInvalidArgumentException exception];
+#endif
 
 		sin = (struct sockaddr_in*)&address->address;
 
 		hash += (sin->sin_port << 1);
 		hash ^= sin->sin_addr.s_addr;

Index: src/resolver.m
==================================================================
--- src/resolver.m
+++ src/resolver.m
@@ -163,19 +163,26 @@
 				free(tmp);
 				@throw [OFOutOfMemoryException
 				    exceptionWithRequestedSize: sizeof(*addr)];
 			}
 
+#ifdef __wii__
+			addr->sin_len = 8;
+#endif
 			addr->sin_family = AF_INET;
 			addr->sin_port = OF_BSWAP16_IF_LE(port);
 			addr->sin_addr.s_addr = s_addr;
 
 			tmp->family = AF_INET;
 			tmp->type = type;
 			tmp->protocol = 0;
 			tmp->address = (struct sockaddr*)addr;
+#ifndef __wii__
 			tmp->addressLength = sizeof(*addr);
+#else
+			tmp->addressLength = 8;
+#endif
 
 			ret[0] = tmp;
 			ret[1] = NULL;
 
 			return ret;