Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -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
 

Index: src/OFIPXSocket.m
==================================================================
--- src/OFIPXSocket.m
+++ src/OFIPXSocket.m
@@ -25,10 +25,14 @@
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 
 #import "OFAlreadyOpenException.h"
 #import "OFBindIPXSocketFailedException.h"
+
+#ifndef NSPROTO_IPX
+# define NSPROTO_IPX 0
+#endif
 
 @implementation OFIPXSocket
 @dynamic delegate;
 
 - (OFSocketAddress)bindToNetwork: (uint32_t)network
@@ -45,11 +49,11 @@
 	if (_socket != OFInvalidSocketHandle)
 		@throw [OFAlreadyOpenException exceptionWithObject: self];
 
 	address = OFSocketAddressMakeIPX(network, node, port);
 
-#ifdef OF_WINDOWS
+#if defined(OF_WINDOWS) || defined(OF_FREEBSD)
 	protocol = NSPROTO_IPX + packetType;
 #else
 	_packetType = address.sockaddr.ipx.sipx_type = packetType;
 #endif
 
@@ -120,11 +124,11 @@
 	}
 
 	return address;
 }
 
-#ifndef OF_WINDOWS
+#if !defined(OF_WINDOWS) && !defined(OF_FREEBSD)
 - (void)sendBuffer: (const void *)buffer
 	    length: (size_t)length
 	  receiver: (const OFSocketAddress *)receiver
 {
 	OFSocketAddress fixedReceiver;

Index: src/OFSocket.h
==================================================================
--- src/OFSocket.h
+++ src/OFSocket.h
@@ -134,12 +134,14 @@
 	sa_family_t sun_family;
 	char sun_path[108];
 };
 #endif
 
-#ifndef OF_HAVE_IPX
+#ifndef IPX_NODE_LEN
 # define IPX_NODE_LEN 6
+#endif
+#ifndef OF_HAVE_IPX
 struct sockaddr_ipx {
 	sa_family_t sipx_family;
 	uint32_t sipx_network;
 	unsigned char sipx_node[IPX_NODE_LEN];
 	uint16_t sipx_port;
@@ -151,10 +153,14 @@
 # define sipx_family sa_family
 # define sipx_network sa_netnum
 # define sipx_node sa_nodenum
 # define sipx_port sa_socket
 #endif
+#ifdef OF_FREEBSD
+# define sipx_network sipx_addr.x_net.c_net
+# define sipx_node sipx_addr.x_host.c_host
+#endif
 
 #ifndef OF_HAVE_APPLETALK
 struct sockaddr_at {
 	sa_family_t sat_family;
 	uint8_t sat_port;