Index: bin/csh/Makefile
===================================================================
--- bin/csh/Makefile
+++ bin/csh/Makefile
@@ -153,11 +153,7 @@
 	    sort >> ${.TARGET}
 	@echo '#endif /* _h_tc_const */' >> ${.TARGET}
 
-beforeinstall:
+beforeinstallconfig:
 	rm -f ${DESTDIR}/.cshrc
 
-afterinstallconfig:
-	sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
-	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
-
 .include <bsd.prog.mk>
Index: bin/sh/Makefile
===================================================================
--- bin/sh/Makefile
+++ bin/sh/Makefile
@@ -63,7 +63,7 @@
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
-beforeinstall:
+beforeinstallconfig:
 	rm -f ${DESTDIR}/.profile
 
 afterinstallconfig:
Index: share/mk/bsd.confs.mk
===================================================================
--- share/mk/bsd.confs.mk
+++ share/mk/bsd.confs.mk
@@ -29,8 +29,11 @@
 .      if !target(afterinstallconfig)
 afterinstallconfig:
 .      endif
-installconfig:	realinstallconfig afterinstallconfig
-.ORDER:		realinstallconfig afterinstallconfig
+.      if !target(beforeinstallconfig)
+beforeinstallconfig:
+.      endif
+installconfig:	beforeinstallconfig realinstallconfig afterinstallconfig
+.ORDER:		beforeinstallconfig realinstallconfig afterinstallconfig
 
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}