Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -47,7 +47,6 @@
 	remote \
 	rpc \
 	services \
-	shells \
 	sysctl.conf \
 	syslog.conf \
 	termcap.small
Index: head/etc/shells
===================================================================
--- head/etc/shells
+++ head/etc/shells
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# List of acceptable shells for chpass(1).
-# Ftpd will not allow users to connect who are not using
-# one of these shells.
-
-/bin/sh
-/bin/csh
-/bin/tcsh
Index: head/lib/libc/gen/Makefile.inc
===================================================================
--- head/lib/libc/gen/Makefile.inc
+++ head/lib/libc/gen/Makefile.inc
@@ -4,6 +4,8 @@
 # machine-independent gen sources
 .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen
 
+CONFS=	shells
+
 SRCS+=	__getosreldate.c \
 	__pthread_mutex_init_calloc_cb_stub.c \
 	__xuname.c \
Index: head/lib/libc/gen/shells
===================================================================
--- head/lib/libc/gen/shells
+++ head/lib/libc/gen/shells
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# List of acceptable shells for chpass(1).
+# Ftpd will not allow users to connect who are not using
+# one of these shells.
+
+/bin/sh
+/bin/csh
+/bin/tcsh