Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1380,10 +1380,21 @@
 	esac
 
 	AC_CHECK_HEADER(sys/socket.h, [
 		AC_DEFINE(OF_HAVE_SYS_SOCKET_H, 1,
 			[Whether we have sys/socket.h])
+	])
+	AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [
+		#ifdef OF_HAVE_SYS_TYPES_H
+		# include <sys/types.h>
+		#endif
+		#ifdef OF_HAVE_SYS_SOCKET_H
+		# include <sys/socket.h>
+		#endif
+		#ifdef _WIN32
+		# include <winsock2.h>
+		#endif
 	])
 	AC_CHECK_TYPE([struct sockaddr_storage], [
 		AC_DEFINE(OF_HAVE_SOCKADDR_STORAGE, 1,
 			[Whether we have struct sockaddr_storage])
 	], [], [

Index: src/platform/POSIX/OFSystemInfo+NetworkInterfaces.m
==================================================================
--- src/platform/POSIX/OFSystemInfo+NetworkInterfaces.m
+++ src/platform/POSIX/OFSystemInfo+NetworkInterfaces.m
@@ -239,15 +239,18 @@
 #  endif
 
 			[addresses addItem: &address];
 
 next:
-# ifdef _SIZEOF_ADDR_IFREQ
-			buffer += _SIZEOF_ADDR_IFREQ(*current);
-# else
-			buffer += sizeof(struct ifreq);
-# endif
+#  ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+			if (current->ifr_addr.sa_len > sizeof(struct sockaddr))
+				buffer += sizeof(struct ifreq) -
+				    sizeof(struct sockaddr) +
+				    current->ifr_addr.sa_len;
+			else
+#  endif
+				buffer += sizeof(struct ifreq);
 		}
 	} @finally {
 		free(ifrs);
 		closesocket(sock);
 	}