diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 65102a10971e..89d2baf8732e 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -14,9 +14,6 @@ FILES=	DAEMON \
 	addswap \
 	adjkerntz \
 	archdep \
-	atm1 \
-	atm2 \
-	atm3 \
 	auditd \
 	auditdistd \
 	bgfsck \
@@ -157,6 +154,14 @@ APM+=		apmd
 APMPACKAGE=	apm
 .endif
 
+.if ${MK_ATM} != "no"
+FILESGROUPS+=	ATM
+ATM+=		atm1
+ATM+=		atm2
+ATM+=		atm3
+ATMPACKAGE=	atm
+.endif
+
 .if ${MK_AUTOFS} != "no"
 FILES+=		automount
 FILES+=		automountd
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index 6174585f4858..e2b182559013 100755
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: atm1 FILESYSTEMS iovctl serial sppp sysctl
+# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
 # REQUIRE: ipfilter ipfs
 # KEYWORD: nojailvnet
 
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 8e94d391dcb4..6343ec64631d 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -76,6 +76,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
 .if ${MK_ATM} == no
+OLD_FILES+=etc/rc.d/atm1
+OLD_FILES+=etc/rc.d/atm2
+OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/bin/sscop