Index: head/lib/libc/gen/Makefile.inc
===================================================================
--- head/lib/libc/gen/Makefile.inc
+++ head/lib/libc/gen/Makefile.inc
@@ -552,7 +552,8 @@
 
 .include <src.tools.mk>
 
-afterinstallconfig:
+afterinstallconfig: install-passwd
+install-passwd: .PHONY
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
Index: head/lib/libc/net/Makefile.inc
===================================================================
--- head/lib/libc/net/Makefile.inc
+++ head/lib/libc/net/Makefile.inc
@@ -124,8 +124,9 @@
 MAN+=	hesiod.3
 .endif
 
+afterinstallconfig: modify-nsswitch-conf
+modify-nsswitch-conf: .PHONY
 .if ${MK_NIS} == "no"
-afterinstallconfig:
 	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
 		${DESTDIR}/etc/nsswitch.conf
 .endif