diff --git a/Makefile b/Makefile
index 320a79f6d0..12b468ca0d 100644
--- a/Makefile
+++ b/Makefile
@@ -360,7 +360,10 @@ CDEFS += -DBEOS
 LDFLAGS += -lmidi -lbe
 ifdef WITH_NETWORK
 	ifdef BEOS_NET_SERVER
-	CDEFS += -DBEOS_NET_SERVER
+		CDEFS += -DBEOS_NET_SERVER
+	else
+		# Zeta needs a few more libraries than R5
+		LDFLAGS += -lbind -lsocket
 	endif
 endif
 endif
diff --git a/network_core.h b/network_core.h
index f341531de3..c6a2789b68 100644
--- a/network_core.h
+++ b/network_core.h
@@ -60,7 +60,7 @@ typedef struct ifreq IFREQ;
 #		include <netinet/tcp.h>
 #		include <arpa/inet.h>
 #		include <net/if.h>
-#		if !defined(SUNOS) && !defined(__MORPHOS__)
+#		if !defined(SUNOS) && !defined(__MORPHOS__) && !defined(__BEOS__)
 #			include <ifaddrs.h>
 // If for any reason ifaddrs.h does not exist on a system, remove define below
 //   and an other system will be used to fetch ips from the system
@@ -68,6 +68,10 @@ typedef struct ifreq IFREQ;
 #		else
 #			define INADDR_NONE 0xffffffff
 #		endif // SUNOS
+#		if defined(__BEOS__) && !defined(BEOS_NET_SERVER)
+			// needed on Zeta
+#			include <sys/sockio.h>
+#		endif
 #	endif // BEOS_NET_SERVER
 
 /* GLibc 2.1 does not support GetIfAddr() */