diff --git a/Jamrules b/Jamrules
index 43ade631b2..5ae9dfae0e 100644
--- a/Jamrules
+++ b/Jamrules
@@ -122,12 +122,10 @@ switch $(TARGET_PLATFORM)
 	}
 }
 if $(BONE_COMPATIBLE) {
-	# FIXME: we don't have our own "libbnetapi.so" yet :-(
-	# NETWORK_LIBS = libsocket.so libbind.so libbnetapi.so ;
-	NETWORK_LIBS = libsocket.so libbind.so bnetapi ;
+	NETWORK_LIBS = libsocket.so libbind.so ;
 	SELECT_UNAME_ETC_LIB = libroot.so ;
 } else {
-	NETWORK_LIBS = libnet.so libnetapi.so ;
+	NETWORK_LIBS = libnet.so ;
 	SELECT_UNAME_ETC_LIB = libnet.so ;
 }
 
diff --git a/src/bin/arp/Jamfile b/src/bin/arp/Jamfile
index 77d9a535cd..b5452efa76 100644
--- a/src/bin/arp/Jamfile
+++ b/src/bin/arp/Jamfile
@@ -8,7 +8,7 @@ if ! $(BONE_COMPATIBLE) {
 
 BinCommand arp :
 	arp.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking
diff --git a/src/bin/ping/Jamfile b/src/bin/ping/Jamfile
index 61399b46b6..07120561c8 100644
--- a/src/bin/ping/Jamfile
+++ b/src/bin/ping/Jamfile
@@ -8,7 +8,7 @@ if ! $(BONE_COMPATIBLE) {
 
 BinCommand ping :
 	ping.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking
diff --git a/src/bin/route/Jamfile b/src/bin/route/Jamfile
index 26cb0927e8..666123638f 100644
--- a/src/bin/route/Jamfile
+++ b/src/bin/route/Jamfile
@@ -10,7 +10,7 @@ BinCommand <bin>route :
 	keywords.c
 	route.c
 	show.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking
diff --git a/src/bin/tar/src/Jamfile b/src/bin/tar/src/Jamfile
index fd268aa20a..1caa80e686 100644
--- a/src/bin/tar/src/Jamfile
+++ b/src/bin/tar/src/Jamfile
@@ -33,5 +33,5 @@ BinCommand tar :
 
 BinCommand rmt :
 	rmt.c
-	: libtar.a $(NETWORK_LIBS) : tar.rsrc
-;
+	: libtar.a $(NETWORK_LIBS)
+	: tar.rsrc ;
diff --git a/src/bin/traceroute/Jamfile b/src/bin/traceroute/Jamfile
index 6c9bb8b261..8c37568c2a 100644
--- a/src/bin/traceroute/Jamfile
+++ b/src/bin/traceroute/Jamfile
@@ -8,7 +8,7 @@ if ! $(BONE_COMPATIBLE) {
 
 BinCommand traceroute :
 	traceroute.c
-: $(NETWORK_LIBS) ;
+	: $(NETWORK_LIBS) $(SELECT_UNAME_ETC_LIB) ;
 
 # Installation -- in the test directory for the time being
 OBOSInstall install-networking
diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile
index 3740b7b8f7..fef0c7253f 100644
--- a/src/kits/mail/Jamfile
+++ b/src/kits/mail/Jamfile
@@ -52,6 +52,7 @@ LinkSharedOSLibs libmail.so :
 	tracker
 	stdc++.r4
 	$(NETWORK_LIBS)
+	$(SELECT_UNAME_ETC_LIB)
 ;
 
 MakeLocate <develop>libmail.so : $(OBOS_STLIB_DIR) ;