@@ -1540,14 +1540,29 @@
 	AC_CHECK_HEADER(netipx/ipx.h, [
 		AC_DEFINE(OF_HAVE_NETIPX_IPX_H, 1,
 			[Whether we have netipx/ipx.h])
 	])
 	AC_CHECK_MEMBER(struct sockaddr_ipx.sipx_network, [], [
-		AC_CHECK_MEMBER(struct sockaddr_ipx.sa_netnum, [], [], [
+		AC_CHECK_MEMBER(struct sockaddr_ipx.sa_netnum, [], [
+			AC_CHECK_MEMBER(struct sockaddr_ipx.sipx_addr.x_port, [
+			], [], [
+				#ifdef HAVE_SYS_TYPES_H
+				# include <sys/types.h>
+				#endif
+
+				#ifdef OF_HAVE_NETIPX_IPX_H
+				# include <netipx/ipx.h>
+				#endif
+			])
+		], [
 			#ifdef _WIN32
 			typedef int BOOL;
 			#endif
+
+			#ifdef HAVE_SYS_TYPES_H
+			# include <sys/types.h>
+			#endif
 
 			#ifdef OF_HAVE_NETIPX_IPX_H
 			# include <netipx/ipx.h>
 			#endif
 
@@ -1564,10 +1579,14 @@
 		])
 	], [
 		#ifdef _WIN32
 		typedef int BOOL;
 		#endif
+
+		#ifdef HAVE_SYS_TYPES_H
+		# include <sys/types.h>
+		#endif
 
 		#ifdef OF_HAVE_NETIPX_IPX_H
 		# include <netipx/ipx.h>
 		#endif
 
@@ -1581,11 +1600,12 @@
 		# include <windows.h>
 		# include <wsipx.h>
 		#endif
 	])
 	AS_IF([test x"$ac_cv_member_struct_sockaddr_ipx_sipx_network" = x"yes" \
-	    -o x"$ac_cv_member_struct_sockaddr_ipx_sa_netnum" = x"yes"], [
+	    -o x"$ac_cv_member_struct_sockaddr_ipx_sa_netnum" = x"yes" -o \
+	    x"$ac_cv_member_struct_sockaddr_ipx_sipx_addr_x_port" = x"yes"], [
 		AC_EGREP_CPP(egrep_cpp_yes, [
 			#ifdef _WIN32
 			typedef int BOOL;
 			#endif