diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 7f177697af..4bc50cc845 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -44,7 +44,7 @@ BEOS_PREFERENCES = Backgrounds DataTranslations FileTypes Fonts Media Menu
 	Mouse Keyboard Keymap Screen ScreenSaver Sounds Time VirtualMemory
 ;
 BEOS_SYSTEM_LIB = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
-	libtranslation.so libnetwork.so libdebug.so libbsd.so libnetapi.so
+	libtranslation.so libnetwork.so libdebug.so libbsd.so
 	libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so
 	libdevice.so libgame.so libscreensaver.so libroot.so $(X86_ONLY)libGL.so
 	libfluidsynth.so libqoca.so
@@ -134,10 +134,12 @@ AddFilesToHaikuImage beos system : kernel_$(TARGET_ARCH) ;
 
 # libs
 AddFilesToHaikuImage beos system lib : $(BEOS_SYSTEM_LIB) ;
+# libnetwork.so replaces quite a few libraries
 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libsocket.so ;
 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbind.so ;
 AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnet.so ;
-AddSymlinkToHaikuImage beos system lib : libnetapi.so : libbnetapi.so ;
+AddSymlinkToHaikuImage beos system lib : libnetwork.so : libnetapi.so ;
+AddSymlinkToHaikuImage beos system lib : libnetwork.so : libbnetapi.so ;
 
 # servers
 AddFilesToHaikuImage beos system servers : $(BEOS_SYSTEM_SERVERS) ;
diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile
index 8df33acb63..0e7da44e9e 100644
--- a/src/kits/network/Jamfile
+++ b/src/kits/network/Jamfile
@@ -8,6 +8,8 @@ SharedLibrary libnetwork.so :
 	socket.cpp
 	r5_compatibility.cpp
 	:
+	<libnetwork_netapi>netapi.o
+
 	<libnetwork_dns>dns_dst.o
 	<libnetwork_dns>dns_inet.o
 	<libnetwork_dns>dns_irs.o
diff --git a/src/kits/network/init.cpp b/src/kits/network/init.cpp
index 540bfdee41..3150879c29 100644
--- a/src/kits/network/init.cpp
+++ b/src/kits/network/init.cpp
@@ -43,9 +43,11 @@ initialize_before()
 	while (__get_next_image_dependency(info.id, &cookie, &name) == B_OK) {
 		if (!strcmp(name, "libbind.so")
 			|| !strcmp(name, "libsocket.so")
+			|| !strcmp(name, "libbnetapi.so")
 			|| !strcmp(name, "libnetwork.so"))
 			enable -= 2;
-		else if (!strcmp(name, "libnet.so"))
+		else if (!strcmp(name, "libnet.so")
+			|| !strcmp(name, "libnetapi.so"))
 			enable++;
 	}
 
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile
index 845a71703e..ef97554d96 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -3,7 +3,13 @@ SubDir HAIKU_TOP src kits network libnetapi ;
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders net ;
-#UseHeaders [ FDirName $(HAIKU_TOP) headers legacy network ] : true ;
+
+local netapi_sources =
+	NetEndpoint.cpp
+	NetAddress.cpp 
+	NetBuffer.cpp
+	NetDebug.cpp
+;
 
 if $(TARGET_PLATFORM) != haiku {
 	UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
@@ -11,32 +17,33 @@ if $(TARGET_PLATFORM) != haiku {
 		# Unfortunately we get more than we want, namely all POSIX headers.
 	UseHeaders [ FStandardOSHeaders ] : true ;
 		# Needed for <net/*.h> and maybe other stuff.
-} else if $(TARGET_PLATFORM) = r5 {
-	defines = [ FDefines BUILDING_R5_LIBNET ] ;
+
+	local defines = [ FDefines BUILDING_R5_LIBNET ] ;
 	SubDirCcFlags $(defines) ;
 	SubDirC++Flags $(defines) ;
+
+	SharedLibrary libnetapi.so :
+		$(netapi_sources)
+		: be $(NETWORK_LIBS)
+	;
+
+	# Installation -- in the test directory for the time being
+	HaikuInstallRelSymLink install-networking
+		: [ FDirName $(HAIKU_TEST_DIR) kits net lib ]
+		: libnetapi.so
+		: installed-networking-test ;
+
+	HaikuInstallRelSymLink install-userland-networking
+		: [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ]
+		: libnetapi.so
+		: installed-userland-networking ;
+
+	Package haiku-networkingkit-cvs :
+		libnetapi.so :
+	#	boot home config lib ;
+		boot home Desktop haiku-networkingkit lib ;
+} else {
+	MergeObject <libnetwork_netapi>netapi.o :
+		$(netapi_sources)
+	;
 }
-
-SharedLibrary libnetapi.so :
-	NetEndpoint.cpp
-	NetAddress.cpp 
-	NetBuffer.cpp
-	NetDebug.cpp
-	: be $(NETWORK_LIBS)
-;
-
-# Installation -- in the test directory for the time being
-HaikuInstallRelSymLink install-networking
-	: [ FDirName $(HAIKU_TEST_DIR) kits net lib ]
-	: libnetapi.so
-	: installed-networking-test ;
-
-HaikuInstallRelSymLink install-userland-networking
-	: [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ]
-	: libnetapi.so
-	: installed-userland-networking ;
-
-Package haiku-networkingkit-cvs :
-	libnetapi.so :
-#	boot home config lib ;
-	boot home Desktop haiku-networkingkit lib ;