diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 7f334ad6b409..68ff477f09c9 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -11,6 +11,11 @@ DEVDDIR=	/etc/devd
 DEVD+=	asus.conf
 .endif
 
+CONFGROUPS+=		AUTOFS
+AUTOFSDIR=		${DEVDDIR}
+AUTOFS+=		autofs.conf
+AUTOFSPACKAGE=		autofs
+
 CONFGROUPS+=		DHCLIENT
 DHCLIENTDIR=		${DEVDDIR}
 DHCLIENT+=		dhclient.conf
diff --git a/sbin/devd/autofs.conf b/sbin/devd/autofs.conf
new file mode 100644
index 000000000000..a06ca7295d38
--- /dev/null
+++ b/sbin/devd/autofs.conf
@@ -0,0 +1,9 @@
+#
+# autofs(5) specific devd events
+
+# Discard autofs caches, useful for the -media special map.
+notify 100 {
+	match "system" "GEOM";
+	match "subsystem" "DEV";
+	action "/usr/sbin/automount -c";
+};
diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf
index d793dd296437..08cbeb840b2f 100644
--- a/sbin/devd/devd.conf
+++ b/sbin/devd/devd.conf
@@ -136,13 +136,6 @@ notify 0 {
 	action			"service postgresql restart";
 };
 
-# Discard autofs caches, useful for the -media special map.
-notify 100 {
-	match "system" "GEOM";
-	match "subsystem" "DEV";
-	action "/usr/sbin/automount -c";
-};
-
 # Handle userland coredumps.
 # This commented out handler makes it possible to run an
 # automated debugging session after the core dump is generated.