diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 20490c95403..1d9023e9c5b 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -11,10 +11,12 @@ DEVDDIR=	/etc/devd
 DEVD+=	asus.conf
 .endif
 
+.if ${MK_AUTOFS} != "no"
 CONFGROUPS+=		AUTOFS
 AUTOFSDIR=		${DEVDDIR}
 AUTOFS+=		autofs.conf
 AUTOFSPACKAGE=		autofs
+.endif
 
 CONFGROUPS+=		DHCLIENT
 DHCLIENTDIR=		${DEVDDIR}
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 6af2a2e33eb..b985adbd1e0 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -127,6 +127,7 @@ OLD_FILES+=etc/autofs/special_media
 OLD_FILES+=etc/autofs/special_noauto
 OLD_FILES+=etc/autofs/special_null
 OLD_FILES+=etc/auto_master
+OLD_FILES+=etc/devd/autofs.conf
 OLD_FILES+=etc/rc.d/automount
 OLD_FILES+=etc/rc.d/automountd
 OLD_FILES+=etc/rc.d/autounmountd