diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile
index 6a45a8d598b2..6ce13c03c4a0 100644
--- a/libexec/dma/dmagent/Makefile
+++ b/libexec/dma/dmagent/Makefile
@@ -17,7 +17,7 @@ SRCS=	aliases_parse.y \
 	util.c
 MAN8=	dma.8
 CONFS=	dma.conf
-CONFSDIR=	${ETCDIR}/dma
+CONFSDIR=	${CONFIGDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
 FILES=	mailer.conf
diff --git a/share/mk/Makefile b/share/mk/Makefile
index eaa8e0f82867..a3560b92ff5c 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -13,6 +13,7 @@ FILES=	\
 	bsd.README \
 	bsd.arch.inc.mk \
 	bsd.compiler.mk \
+	bsd.confs.mk \
 	bsd.cpu.mk \
 	bsd.crunchgen.mk \
 	bsd.dep.mk \
diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk
index a65410c0346a..4e219e828bcf 100644
--- a/share/mk/bsd.confs.mk
+++ b/share/mk/bsd.confs.mk
@@ -22,7 +22,7 @@ all: buildconfig
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${CONFMODE}
-${group}DIR?=	${ETCDIR}/
+${group}DIR?=	${CONFIGDIR}/
 STAGE_SETS+=	${group}
 STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
 STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 450db0844862..53fd073a44ba 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -213,7 +213,7 @@ NLSGRP?=	${SHAREGRP}
 NLSMODE?=	${NOBINMODE}
 
 INCLUDEDIR?=	/usr/include
-ETCDIR?=	/etc
+CONFIGDIR?=	/etc
 
 #
 # install(1) parameters.
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 6a3d8f2d1591..8bd11534a3b4 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -22,7 +22,7 @@ PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
 CONFS=	ppp.conf
-CONFSDIR=	${ETCDIR}/ppp
+CONFSDIR=	${CONFIGDIR}/ppp
 CONFSMODE=	600
 
 .if ${MK_ATM} == "no"