diff --git a/etc/Makefile b/etc/Makefile
index 71283a973eaa..91eaa0ca50fc 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -16,18 +16,13 @@ BIN1=	\
 	dhclient.conf \
 	disktab \
 	group \
-	hosts \
 	hosts.allow \
-	hosts.equiv \
 	libalias.conf \
 	libmap.conf \
 	login.access \
 	mac.conf \
 	netconfig \
-	networks \
-	nsswitch.conf \
 	phones \
-	protocols \
 	rc.bsdextended \
 	rc.firewall \
 	remote \
@@ -160,10 +155,6 @@ distribution:
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
-.if ${MK_NIS} == "no"
-	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
-		${DESTDIR}/etc/nsswitch.conf
-.endif
 
 MTREE_CMD?=	mtree
 
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 304c465b8545..b31c1a36fcfe 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -4,6 +4,7 @@
 # machine-independent net sources
 .PATH: ${LIBC_SRCTOP}/net
 
+CONFS+=	net/hosts net/hosts.equiv net/networks net/nsswitch.conf net/protocols
 SRCS+=	base64.c ether_addr.c eui64.c \
 	gai_strerror.c getaddrinfo.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
@@ -123,3 +124,8 @@ SRCS+=	hesiod.c
 MAN+=	hesiod.3
 .endif
 
+.if ${MK_NIS} == "no"
+afterinstallconfig:
+	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
+		${DESTDIR}/etc/nsswitch.conf
+.endif
diff --git a/etc/hosts b/lib/libc/net/hosts
similarity index 100%
rename from etc/hosts
rename to lib/libc/net/hosts
diff --git a/etc/hosts.equiv b/lib/libc/net/hosts.equiv
similarity index 100%
rename from etc/hosts.equiv
rename to lib/libc/net/hosts.equiv
diff --git a/etc/networks b/lib/libc/net/networks
similarity index 100%
rename from etc/networks
rename to lib/libc/net/networks
diff --git a/etc/nsswitch.conf b/lib/libc/net/nsswitch.conf
similarity index 100%
rename from etc/nsswitch.conf
rename to lib/libc/net/nsswitch.conf
diff --git a/etc/protocols b/lib/libc/net/protocols
similarity index 100%
rename from etc/protocols
rename to lib/libc/net/protocols