Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile
+++ head/etc/Makefile
@@ -56,14 +56,6 @@
 .error etc.MACHINE/ttys missing
 .endif
 
-OPENBSMDIR=			${SRCTOP}/contrib/openbsm
-BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \
-				${OPENBSMDIR}/etc/audit_event
-BSM_ETC_RESTRICTED_FILES=	${OPENBSMDIR}/etc/audit_control \
-				${OPENBSMDIR}/etc/audit_user
-BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
-BSM_ETC_DIR=			${DESTDIR}/etc/security
-
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_AMD} != "no"
@@ -203,12 +195,6 @@
 	${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
 	${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
-	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
-	    ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
-	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
-	    ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
-	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
-	    ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
 .if ${MK_UNBOUND} != "no"
 	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
 		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
Index: head/usr.sbin/auditd/Makefile
===================================================================
--- head/usr.sbin/auditd/Makefile
+++ head/usr.sbin/auditd/Makefile
@@ -7,6 +7,18 @@
 
 CFLAGS+=	-I${OPENBSMDIR}
 
+OPENBSMETCDIR=  ${OPENBSMDIR}/etc
+CONFS=  ${OPENBSMETCDIR}/audit_class
+CONFSMODE_${OPENBSMETCDIR}/audit_class= 444
+CONFS+= ${OPENBSMETCDIR}/audit_control
+CONFSMODE_${OPENBSMETCDIR}/audit_control=       600
+CONFS+= ${OPENBSMETCDIR}/audit_event
+CONFSMODE_${OPENBSMETCDIR}/audit_event= 444
+CONFS+= ${OPENBSMETCDIR}/audit_user
+CONFSMODE_${OPENBSMETCDIR}/audit_user=  600
+CONFS+= ${OPENBSMETCDIR}/audit_warn
+CONFSMODE_${OPENBSMETCDIR}/audit_warn=  500
+CONFSDIR=       /etc/security
 PROG=	auditd
 SRCS=	auditd.c audit_warn.c auditd_fbsd.c
 MAN=	auditd.8