diff --git a/sbin/bsdlabel/disktab b/etc/disktab
rename from sbin/bsdlabel/disktab
rename to etc/disktab
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,7 +1,7 @@
 # machine-independent gen sources
 .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen ${SRCTOP}/etc
 
-CONFS+=	group master.passwd shells
+CONFS+=	disktab group master.passwd shells
 CONFSMODE_master.passwd=	600
 CONFSPACKAGE=   runtime
 
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -1,6 +1,5 @@
 .PATH: ${SRCTOP}/sys/geom
 
-CONFS=	disktab
 PACKAGE=runtime
 PROG=	bsdlabel
 SRCS=	bsdlabel.c geom_bsd_enc.c