4 files changed, 6 insertions, 0 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 43a870906202..33e66a867d0a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -744,6 +744,7 @@ options 	FFS			#Fast filesystem
 options 	NFSCLIENT		#Network File System client
 
 # The rest are optional:
+options		AUTOFS			#Auto File System
 options 	CD9660			#ISO 9660 filesystem
 options 	FDESCFS			#File descriptor filesystem
 options 	HPFS			#OS/2 File system
diff --git a/sys/conf/files b/sys/conf/files
index 0874c7ad9b7e..2d675b081bd5 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -858,6 +858,9 @@ dev/xe/if_xe_pccard.c		optional xe pccard
 dev/zs/zs.c			optional zs
 dev/zs/zs_sbus.c		optional zs fhc
 dev/zs/zs_sbus.c		optional zs sbus
+fs/autofs/autofs_vnops.c	optional autofs
+fs/autofs/autofs_vfsops.c	optional autofs
+fs/autofs/autofs_util.c		optional autofs
 fs/deadfs/dead_vnops.c	standard
 fs/devfs/devfs_devs.c		standard
 fs/devfs/devfs_rule.c		standard
diff --git a/sys/conf/options b/sys/conf/options
index f7ac6d25b5a2..0ea8f9ea4af6 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -161,6 +161,7 @@ INCLUDE_CONFIG_FILE	opt_config.h
 # time, since the corresponding lkms cannot work if there are any static
 # dependencies.  Unusability is enforced by hiding the defines for the
 # options in a never-included header.
+AUTOFS		opt_dontuse.h
 CD9660		opt_dontuse.h
 CODA		opt_dontuse.h
 EXT2FS		opt_dontuse.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 8964983ab066..a502b5c124fc 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -27,6 +27,7 @@ SUBDIR=	${_3dfx} \
 	ath \
 	${_ath_hal} \
 	aue \
+	autofs \
 	${_awi} \
 	axe \
 	bfe \