diff --git a/src/tools/jam/Jamfile b/src/tools/jam/Jamfile
index 1e60c466b4..a65dab29bf 100644
--- a/src/tools/jam/Jamfile
+++ b/src/tools/jam/Jamfile
@@ -118,11 +118,6 @@ if $(VMS)
 	CCFLAGS += /define=VMS ;
 }
 
-# Need to link against -lnet
-if $(OS) = BEOS {
-#	LINKLIBS += -lnet ;
-}
-
 if $(OS) = BEOS {
 	DEFINES += _ZETA_USING_DEPRECATED_API_=1 ;
 }
diff --git a/src/tools/jam/Makefile b/src/tools/jam/Makefile
index a4167f24e2..b16cd5be93 100644
--- a/src/tools/jam/Makefile
+++ b/src/tools/jam/Makefile
@@ -53,7 +53,9 @@ HOST_SYSTEM=$(shell uname)
 
 # BeOS (R5 only, actually, but who cares)
 ifeq ($(HOST_SYSTEM), BeOS)
-#	LINKLIBS = -lnet
+	ifeq ($(shell sh -c "strings /system/lib/libroot.so | grep uname"), )
+		LINKLIBS = -lnet
+	endif
 endif
 
 SOURCES = \
@@ -65,7 +67,7 @@ SOURCES = \
 	rules.c scan.c search.c timestamp.c variable.c
 
 all: $(EXENAME)
-	$(EXENAME)
+	LINKLIBS=$(LINKLIBS) $(EXENAME)
 
 $(EXENAME):
 	$(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS)