diff --git a/etc/Makefile b/etc/Makefile
index 5dc308301de5..a90fa768ac49 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -14,10 +14,6 @@ UPDATE_DEPENDFILE=	no
 SUBDIR+=sendmail
 .endif
 
-BIN1=	\
-	login.access \
-	login.access
-
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_SENDMAIL} == "no"
@@ -56,9 +52,6 @@ distribution:
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
-	cd ${.CURDIR}; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-		${BIN1} ${DESTDIR}/etc
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
 	${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
@@ -168,11 +161,6 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 .endfor
 .endif
 
-etc-examples: ${META_DEPS}
-	cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${BIN1} ${BIN2} \
-	    ${DESTDIR}${SHAREDIR}/examples/etc
-
 .include <bsd.prog.mk>
 
 .if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 1de97997c229..50ca81fb2f3b 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -381,9 +381,8 @@ SER_${d:tu:C/\//_/g}DIR+=	${SHAREDIR}/examples/${d}
 
 BINDIR= ${SHAREDIR}/examples
 
-beforeinstall: copies etc-examples
+beforeinstall: copies
 META_TARGETS+=	copies
-.ORDER: etc-examples
 
 copies:
 .for i in ${LDIRS}
@@ -392,9 +391,6 @@ copies:
 	fi
 .endfor
 
-etc-examples:
-	${_+_}(cd ${SRCTOP}/etc; ${MAKE} etc-examples)
-
 SUBDIR+=	smbfs
 
 HAS_TESTS=
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 6e88c2224b04..af83c970cc17 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -3,7 +3,7 @@
 
 .include <src.opts.mk>
 
-CONFS=	fbtab login.conf motd
+CONFS=	fbtab login.conf motd login.access
 PROG=	login
 SRCS=	login.c login_fbtab.c
 CFLAGS+=-DLOGALL