diff --git a/src/tests/kits/net/netperf/Jamfile b/src/tests/kits/net/netperf/Jamfile
index 79fe578133..a38d0201e0 100644
--- a/src/tests/kits/net/netperf/Jamfile
+++ b/src/tests/kits/net/netperf/Jamfile
@@ -1,5 +1,7 @@
 SubDir OBOS_TOP src tests kits net netperf ;
 
+Depends netperf : install_netperf_scripts ;
+
 SimpleTest netperf : 
 	netperf.c
 	netsh.c
@@ -11,4 +13,30 @@ SimpleTest netperf :
 	nettest_ipv6.c
 	nettest_dns.c
 	: net
-	;
+;
+
+SimpleTest netserver : 
+	netserver.c
+	netsh.c
+	netlib.c
+	nettest_bsd.c
+	nettest_dlpi.c
+	nettest_unix.c
+	nettest_xti.c
+	nettest_ipv6.c
+	nettest_dns.c
+	: net
+;
+
+OBOSInstall install_netperf_scripts : [ FDirName $(OBOS_TEST_DIR) kits net netperf ] :
+	snapshot_script
+	tcp_range_script
+	tcp_rr_script
+	tcp_stream_script
+	udp_rr_script
+	udp_stream_script
+	packet_byte_script
+	arr_script
+;
+
+
diff --git a/src/tests/kits/net/netperf/netserver.c b/src/tests/kits/net/netperf/netserver.c
index 2f794fb25c..53e5f4e06b 100644
--- a/src/tests/kits/net/netperf/netserver.c
+++ b/src/tests/kits/net/netperf/netserver.c
@@ -70,9 +70,9 @@ char	netserver_id[]="\
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
-#if !defined(WIN32) && !defined(__VMS)
+#if !defined(WIN32) && !defined(__VMS) && !defined(__BEOS__)
 #include <sys/ipc.h>
-#endif /* !defined(WIN32) && !defined(__VMS) */
+#endif /* !defined(WIN32) && !defined(__VMS) && !defined(__BEOS__) */
 #include <fcntl.h>
 #ifdef WIN32
 #include <time.h>