diff --git a/etc/Makefile b/etc/Makefile
index d1885d291a44..b4d0ea054c38 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -226,7 +226,7 @@ distribution:
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
-.if ${MK_DMA} != "no"
+.if ${MK_DMAGENT} != "no"
 	${_+_}cd ${.CURDIR}/dma; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
diff --git a/libexec/Makefile b/libexec/Makefile
index 8463b9075ca5..e087a8a8ffe7 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -49,7 +49,7 @@ _casper=	casper
 _comsat=	comsat
 .endif
 
-.if ${MK_DMA} != "no"
+.if ${MK_DMAGENT} != "no"
 _dma=		dma
 _dma-mbox-create=	dma-mbox-create
 .endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 2a79c42e01c7..f4fd64433aae 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -271,7 +271,7 @@ __DEFAULT_YES_OPTIONS = \
     CTM \
     CXX \
     DICT \
-    DMA \
+    DMAGENT \
     DYNAMICROOT \
     ED_CRYPTO \
     EXAMPLES \
@@ -512,7 +512,7 @@ MK_GROFF:=	no
 .if ${MK_MAIL} == "no"
 MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no
-MK_DMA:=	no
+MK_DMAGENT:=	no
 .endif
 
 .if ${MK_NETGRAPH} == "no"
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index b124ab942d57..6f9f87513e70 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4307,7 +4307,7 @@ OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 .endif
 
-.if ${MK_DMA} == no
+.if ${MK_DMAGENT} == no
 OLD_FILES+=usr/libexec/dma
 OLD_FILES+=usr/libexec/dma-mbox-create
 OLD_FILES+=usr/share/man/man8/dma.8.gz
diff --git a/tools/build/options/WITHOUT_DMA b/tools/build/options/WITHOUT_DMAGENT
similarity index 100%
rename from tools/build/options/WITHOUT_DMA
rename to tools/build/options/WITHOUT_DMAGENT