diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5faea2f5d5e2..7a68c2e224c4 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
+#	$Id: LINT,v 1.440 1998/06/30 03:01:30 jmg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -490,6 +490,8 @@ options		DEVFS			#devices filesystem
 options		MFS_ROOT=10
 # Allow the MFS_ROOT code to load the MFS image from floppy if it is missing.
 options		MFS_AUTOLOAD
+# Allows MFS filesystems to be exported via nfs
+options		EXPORTMFS
 
 # Allow this many swap-devices.
 options		NSWAPDEV=20
diff --git a/sys/conf/options b/sys/conf/options
index fff0df434700..9f2c32c2ec4a 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.78 1998/06/28 01:03:13 dfr Exp $
+#	$Id: options,v 1.79 1998/06/30 03:01:29 jmg Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -48,6 +48,7 @@ KTRACE
 MD5
 MFS_AUTOLOAD	opt_mfs.h
 MFS_ROOT	opt_mfs.h
+EXPORTMFS	opt_mfs.h
 NO_LKM
 NSWAPDEV	opt_swap.h
 PPS_SYNC	opt_ntp.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 5faea2f5d5e2..7a68c2e224c4 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
+#	$Id: LINT,v 1.440 1998/06/30 03:01:30 jmg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -490,6 +490,8 @@ options		DEVFS			#devices filesystem
 options		MFS_ROOT=10
 # Allow the MFS_ROOT code to load the MFS image from floppy if it is missing.
 options		MFS_AUTOLOAD
+# Allows MFS filesystems to be exported via nfs
+options		EXPORTMFS
 
 # Allow this many swap-devices.
 options		NSWAPDEV=20
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 5faea2f5d5e2..7a68c2e224c4 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
+#	$Id: LINT,v 1.440 1998/06/30 03:01:30 jmg Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -490,6 +490,8 @@ options		DEVFS			#devices filesystem
 options		MFS_ROOT=10
 # Allow the MFS_ROOT code to load the MFS image from floppy if it is missing.
 options		MFS_AUTOLOAD
+# Allows MFS filesystems to be exported via nfs
+options		EXPORTMFS
 
 # Allow this many swap-devices.
 options		NSWAPDEV=20