Index: projects/release-pkg/usr.bin/chpass/Makefile
===================================================================
--- projects/release-pkg/usr.bin/chpass/Makefile	(revision 294971)
+++ projects/release-pkg/usr.bin/chpass/Makefile	(revision 294972)
@@ -1,38 +1,45 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
 
 PROG=	chpass
 SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=	root
 BINMODE=4555
 PRECIOUSPROG=
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
 LIBADD=	crypt util
 .if ${MK_NIS} != "no"
 LIBADD+=	ypclnt
 .endif 
 
 SYMLINKS=	${BINDIR}/chpass ${BINDIR}/chfn
 SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
 .if ${MK_NIS} != "no"
 SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
 SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
 SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
 .endif
 
 MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
 .if ${MK_NIS} != "no"
 MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 .endif
 
+beforeinstall:
+.for i in chpass chfn chsh ypchpass ypchfn ypchsh
+.if exists(${DESTDIR}${BINDIR}/$i)
+	-chflags noschg ${DESTDIR}${BINDIR}/$i
+.endif
+.endfor
+
 .include <bsd.prog.mk>
Index: projects/release-pkg/usr.bin/passwd/Makefile
===================================================================
--- projects/release-pkg/usr.bin/passwd/Makefile	(revision 294971)
+++ projects/release-pkg/usr.bin/passwd/Makefile	(revision 294972)
@@ -1,26 +1,22 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
+PRECIOUSPROG=
 LIBADD   = pam
 .if ${MK_NIS} != "no"
-LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
+SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
 
 beforeinstall:
 .for i in passwd yppasswd
 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
 		chflags noschg ${DESTDIR}${BINDIR}/$i || true
 .endfor
-
-.if !defined(NO_FSCHG)
-afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/passwd
-.endif
 
 .include <bsd.prog.mk>