diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
index 20368ed2f7..4cc2788cea 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -271,11 +271,7 @@ SEARCH on $(driverSettingsFiles)
 AddFilesToHaikuImage home config settings kernel drivers
 	: $(driverSettingsFiles) ;
 
-local networkSettingsFiles =
-	<network-settings>ports
-	<network-settings>protocols
-	<network-settings>services
-;
+local networkSettingsFiles = <network-settings>services ;
 SEARCH on $(networkSettingsFiles)
 	= [ FDirName $(HAIKU_TOP) data settings network ] ;
 AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ;
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index a672605684..9043132325 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -298,6 +298,11 @@ CopyDirectoryToPackage data
 	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses ;
 
+# netresolv support files
+CopyDirectoryToPackage data
+	: [ FDirName $(HAIKU_TOP) data system data network ]
+	: network ;
+
 # Copy documentation as per DiskUsage's license requirement.
 CopyDirectoryToPackage documentation
 	: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index 3ef6cdf377..f6aee2aa0e 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -253,6 +253,11 @@ CopyDirectoryToPackage data
 	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses ;
 
+# netresolv support files
+CopyDirectoryToPackage data
+	: [ FDirName $(HAIKU_TOP) data system data network ]
+	: network ;
+
 # Copy documentation as per DiskUsage's license requirement.
 CopyDirectoryToPackage documentation
 	: [ FDirName $(HAIKU_TOP) docs apps diskusage ]
diff --git a/data/settings/network/ports b/data/system/data/network/ports
similarity index 100%
rename from data/settings/network/ports
rename to data/system/data/network/ports
diff --git a/data/settings/network/protocols b/data/system/data/network/protocols
similarity index 100%
rename from data/settings/network/protocols
rename to data/system/data/network/protocols
diff --git a/src/kits/network/netresolv/irs/getprotoent_r.c b/src/kits/network/netresolv/irs/getprotoent_r.c
index 0ed0bc2bca..d1a9c0dfb1 100644
--- a/src/kits/network/netresolv/irs/getprotoent_r.c
+++ b/src/kits/network/netresolv/irs/getprotoent_r.c
@@ -60,7 +60,7 @@ setprotoent_r(int f, struct protoent_data *pd)
 {
 	if (pd->fp == NULL) {
 		char buffer[256];
-		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer));
+		find_directory(B_SYSTEM_DATA_DIRECTORY, 0, false, buffer, sizeof(buffer));
 		strlcat(buffer, "/network/protocols", sizeof(buffer));
 
 		pd->fp = fopen(buffer, "re");
diff --git a/src/kits/network/netresolv/irs/getservent_r.c b/src/kits/network/netresolv/irs/getservent_r.c
index 0ee4b2e8f7..6f39d7934b 100644
--- a/src/kits/network/netresolv/irs/getservent_r.c
+++ b/src/kits/network/netresolv/irs/getservent_r.c
@@ -84,7 +84,7 @@ _servent_open(struct servent_data *sd)
 	}
 #endif
 
-	find_directory(B_SYSTEM_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer));
+	find_directory(B_SYSTEM_DATA_DIRECTORY, 0, false, buffer, sizeof(buffer));
 	strlcat(buffer, "/network/ports", sizeof(buffer));
 
 	sd->plainfile = fopen(buffer, "re");