diff --git a/etc/Makefile b/etc/Makefile
index 5b32e3a5664..18672da0a12 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -15,7 +15,6 @@ SUBDIR+=sendmail
 BIN1=	crontab \
 	dhclient.conf \
 	disktab \
-	fbtab \
 	gettytab \
 	group \
 	hosts \
@@ -24,9 +23,7 @@ BIN1=	crontab \
 	libalias.conf \
 	libmap.conf \
 	login.access \
-	login.conf \
 	mac.conf \
-	motd \
 	netconfig \
 	networks \
 	nsswitch.conf \
@@ -117,7 +114,6 @@ distribution:
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
-	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 
@@ -127,7 +123,6 @@ distribution:
 	pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT)
 	( \
-		echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 0763c845b6c..6e88c2224b0 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+CONFS=	fbtab login.conf motd
 PROG=	login
 SRCS=	login.c login_fbtab.c
 CFLAGS+=-DLOGALL
@@ -22,4 +23,12 @@ BINMODE=4555
 PRECIOUSPROG=
 .endif
 
+.include <bsd.endian.mk>
+afterinstallconfig:
+	cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf
+.if defined(NO_ROOT) && defined(METALOG)
+	echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel" | \
+		cat -l >> ${METALOG}
+.endif
+
 .include <bsd.prog.mk>
diff --git a/etc/fbtab b/usr.bin/login/fbtab
similarity index 100%
rename from etc/fbtab
rename to usr.bin/login/fbtab
diff --git a/etc/login.conf b/usr.bin/login/login.conf
similarity index 100%
rename from etc/login.conf
rename to usr.bin/login/login.conf
diff --git a/etc/motd b/usr.bin/login/motd
similarity index 100%
rename from etc/motd
rename to usr.bin/login/motd