2 files changed, 16 insertions, 4 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e4e363576838..c874a973de98 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -690,11 +690,17 @@ options		IFS
 options 	SOFTUPDATES
 
 # Extended attributes allow additional data to be associated with files,
-# and is used for ACLs, Capabilities, and MAC labels
-#
+# and is used for ACLs, Capabilities, and MAC labels.
+# See src/sys/ufs/ufs/README.extattr for more information.
 options		UFS_EXTATTR
 options		UFS_EXTATTR_AUTOSTART
 
+# Access Control List support for UFS filesystems.  The current ACL
+# implementation requires extended attribute support, UFS_EXTATTR,
+# for the underlying filesystem.
+# See src/sys/ufs/ufs/README.acls for more information.
+options 	UFS_ACL
+
 # Make space in the kernel for a root filesystem on a md device.
 # Define to the number of kilobytes to reserve for the filesystem.
 options 	MD_ROOT_SIZE=10
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index e4e363576838..c874a973de98 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -690,11 +690,17 @@ options		IFS
 options 	SOFTUPDATES
 
 # Extended attributes allow additional data to be associated with files,
-# and is used for ACLs, Capabilities, and MAC labels
-#
+# and is used for ACLs, Capabilities, and MAC labels.
+# See src/sys/ufs/ufs/README.extattr for more information.
 options		UFS_EXTATTR
 options		UFS_EXTATTR_AUTOSTART
 
+# Access Control List support for UFS filesystems.  The current ACL
+# implementation requires extended attribute support, UFS_EXTATTR,
+# for the underlying filesystem.
+# See src/sys/ufs/ufs/README.acls for more information.
+options 	UFS_ACL
+
 # Make space in the kernel for a root filesystem on a md device.
 # Define to the number of kilobytes to reserve for the filesystem.
 options 	MD_ROOT_SIZE=10