Index: libexec/rc/rc.conf
===================================================================
--- libexec/rc/rc.conf
+++ libexec/rc/rc.conf
@@ -352,6 +352,7 @@
 amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"
 amd_map_program="NO"		# Can be set to "ypcat -k amd.master"
 autofs_enable="NO"		# Run autofs daemons.
+autofs_masters="net"		# Default set of mounts for autofs.
 automount_flags=""		# Flags to automount(8) (if autofs enabled).
 automountd_flags=""		# Flags to automountd(8) (if autofs enabled).
 autounmountd_flags=""		# Flags to autounmountd(8) (if autofs enabled).
Index: usr.sbin/autofs/auto_master
===================================================================
--- usr.sbin/autofs/auto_master
+++ usr.sbin/autofs/auto_master
@@ -2,7 +2,8 @@
 #
 # Automounter master map, see auto_master(5) for details.
 #
-/net		-hosts		-nobrowse,nosuid,intr
+# Uncomment lines here, or add to autofs_masters in rc.conf:
+#/net		-hosts		-nobrowse,nosuid,intr
 # When using the -media special map, make sure to edit devd.conf(5)
 # to move the call to "automount -c" out of the comments section.
 #/media		-media		-nosuid,noatime,autoro
Index: usr.sbin/autofs/autofs/Makefile
===================================================================
--- usr.sbin/autofs/autofs/Makefile
+++ usr.sbin/autofs/autofs/Makefile
@@ -6,7 +6,10 @@
 		special_hosts \
 		special_media \
 		special_noauto \
-		special_null
+		special_null \
+		master_net \
+		master_media \
+		master_noauto
 
 NO_OBJ=
 CONFDIR=	/etc/autofs
Index: usr.sbin/autofs/autofs/master_media
===================================================================
--- usr.sbin/autofs/autofs/master_media
+++ usr.sbin/autofs/autofs/master_media
@@ -0,0 +1,3 @@
+# When using the -media special map, make sure to edit devd.conf(5)
+# to move the call to "automount -c" out of the comments section.
+/media		-media		-nosuid,noatime,autoro
Index: usr.sbin/autofs/autofs/master_net
===================================================================
--- usr.sbin/autofs/autofs/master_net
+++ usr.sbin/autofs/autofs/master_net
@@ -0,0 +1 @@
+/net		-hosts		-nobrowse,nosuid,intr
Index: usr.sbin/autofs/autofs/master_noauto
===================================================================
--- usr.sbin/autofs/autofs/master_noauto
+++ usr.sbin/autofs/autofs/master_noauto
@@ -0,0 +1 @@
+/-		-noauto