diff --git a/etc/Makefile b/etc/Makefile
index 053a40705efe..ab17e1efeb2c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -239,9 +239,6 @@ distribution:
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
-.if ${MK_DMAGENT} != "no"
-	${_+_}cd ${.CURDIR}/dma; ${MAKE} install
-.endif
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 .if ${MK_PKGBOOTSTRAP} != "no"
diff --git a/etc/dma/Makefile b/etc/dma/Makefile
deleted file mode 100644
index 0544f6f8f0a7..000000000000
--- a/etc/dma/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-FILES=	dma.conf
-
-NO_OBJ=
-FILESDIR=	/etc/dma
-
-.include <bsd.prog.mk>
diff --git a/libexec/Makefile b/libexec/Makefile
index 27d245e5e070..ca88d9d6bced 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -8,7 +8,6 @@ SUBDIR=	${_atf} \
 	${_casper} \
 	${_comsat} \
 	${_dma} \
-	${_dma-mbox-create} \
 	getty \
 	${_mail.local} \
 	${_mknetid} \
@@ -56,7 +55,6 @@ _comsat=	comsat
 
 .if ${MK_DMAGENT} != "no"
 _dma=		dma
-_dma-mbox-create=	dma-mbox-create
 .endif
 
 .if ${MK_NIS} != "no"
diff --git a/libexec/dma-mbox-create/Makefile b/libexec/dma-mbox-create/Makefile
deleted file mode 100644
index f0a2341a916a..000000000000
--- a/libexec/dma-mbox-create/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../contrib/dma
-
-CFLAGS=	-I${.CURDIR}/../../contrib/dma \
-	-DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
-	-DCONF_PATH='"/etc/dma"' \
-	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"'
-
-MAN=
-
-WARNS=	2
-
-PROG=	dma-mbox-create
-BINGRP=	mail
-BINMODE=	4554
-
-.include <bsd.prog.mk>
diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc
new file mode 100644
index 000000000000..cdc9cea2bfae
--- /dev/null
+++ b/libexec/dma/Makefile.inc
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.sinclude "${.CURDIR}/../../Makefile.inc"
+DMA_SOURCES=	${.CURDIR}/../../../contrib/dma
+.PATH:	${DMA_SOURCES}
+
+CFLAGS=	-I${DMA_SOURCES} \
+	-DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
+	-DCONF_PATH='"/etc/dma"' \
+	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
+	-DDMA_ROOT_USER='"mailnull"' \
+	-DDMA_GROUP='"mail"'
+BINGRP=	mail
diff --git a/libexec/dma/dma-mbox-create/Makefile b/libexec/dma/dma-mbox-create/Makefile
new file mode 100644
index 000000000000..a745f591c776
--- /dev/null
+++ b/libexec/dma/dma-mbox-create/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+MAN=
+
+WARNS=	2
+
+PROG=	dma-mbox-create
+BINMODE=	4554
+
+.include <bsd.prog.mk>
diff --git a/libexec/dma/Makefile b/libexec/dma/dma/Makefile
similarity index 55%
rename from libexec/dma/Makefile
rename to libexec/dma/dma/Makefile
index 65c738202842..6a45a8d598b2 100644
--- a/libexec/dma/Makefile
+++ b/libexec/dma/dma/Makefile
@@ -1,13 +1,5 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../contrib/dma
-
-CFLAGS=	-I${.CURDIR}/../../contrib/dma \
-	-DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \
-	-DCONF_PATH='"/etc/dma"' \
-	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
-	-DDMA_ROOT_USER='"mailnull"' \
-	-DDMA_GROUP='"mail"'
 LIBADD=	ssl crypto
 
 PROG=	dma
@@ -24,10 +16,13 @@ SRCS=	aliases_parse.y \
 	spool.c \
 	util.c
 MAN8=	dma.8
+CONFS=	dma.conf
+CONFSDIR=	${ETCDIR}/dma
 YFLAGS+=	-i
 CLEANFILES=	aliases_parse.i
+FILES=	mailer.conf
+FILESDIR=	${SHAREDIR}/examples/dma
 
-BINGRP=	mail
 BINMODE=	2555
 
 .include <bsd.compiler.mk>
diff --git a/etc/dma/dma.conf b/libexec/dma/dma/dma.conf
similarity index 100%
rename from etc/dma/dma.conf
rename to libexec/dma/dma/dma.conf
diff --git a/share/examples/dma/mailer.conf b/libexec/dma/dma/mailer.conf
similarity index 100%
rename from share/examples/dma/mailer.conf
rename to libexec/dma/dma/mailer.conf
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 3a4d1c4409b3..f20ea7f2b5bc 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -255,9 +255,6 @@ SUBDIR+=ipfilter
 .if ${MK_PF} != "no"
 SUBDIR+=pf
 .endif
-.if ${MK_DMAGENT} != "no"
-SUBDIR+=dma
-.endif
 .endif
 
 .if ${MK_TESTS} != "no"
diff --git a/share/examples/dma/Makefile b/share/examples/dma/Makefile
deleted file mode 100644
index d4ce70930fe8..000000000000
--- a/share/examples/dma/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-NO_OBJ=
-
-FILES=	mailer.conf
-
-FILESDIR=	${SHAREDIR}/examples/dma
-
-.include <bsd.prog.mk>
-