diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ae772ae8b73b..ee9e2d962368 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -726,14 +726,6 @@ options 	MD_ROOT_SIZE=10
 # images of type mfs_root or md_root.
 options 	MD_ROOT
 
-# Allow this many swap-devices.
-#
-# In order to manage swap, the system must reserve bitmap space that
-# scales with the largest mounted swap device multiplied by NSWAPDEV, 
-# irrespective of whether other swap devices exist.  So it is not a
-# good idea to make this value too large.
-options 	NSWAPDEV=5
-
 # Disk quotas are supported when this option is enabled.
 options 	QUOTA			#enable disk quotas
 
diff --git a/sys/conf/options b/sys/conf/options
index 4d09c8223962..e4769dd1b61d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -119,7 +119,6 @@ MAC_TEST	opt_dontuse.h
 MD_ROOT		opt_md.h
 MD_ROOT_SIZE	opt_md.h
 NDGBPORTS	opt_dgb.h
-NSWAPDEV	opt_swap.h
 NSWBUF_MIN	opt_swap.h
 NTIMECOUNTER	opt_ntp.h
 PANIC_REBOOT_WAIT_TIME	opt_panic.h