diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 8dc74f28e2b7..4d7c596f2917 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -385,6 +385,11 @@ options 	KDTRACE_HOOKS
 #
 options 	SYSCTL_DEBUG
 
+#
+# NO_SYSCTL_DESCR omits the sysctl node descriptions to save space in the
+# resulting kernel.
+options		NO_SYSCTL_DESCR
+
 #
 # DEBUG_MEMGUARD builds and enables memguard(9), a replacement allocator
 # for the kernel used to detect modify-after-free scenarios.  See the
@@ -2596,8 +2601,10 @@ device		uhid
 device		ukbd
 # USB printer
 device		ulpt
-# USB Iomega Zip 100 Drive (Requires scbus and da)
+# USB mass storage driver (Requires scbus and da)
 device		umass
+# USB mass storage driver for device-side mode
+device		usfs
 # USB support for Belkin F5U109 and Magic Control Technology serial adapters
 device		umct
 # USB modem support
diff --git a/sys/dev/aic7xxx/aic79xx_osm.c b/sys/dev/aic7xxx/aic79xx_osm.c
index 81eade6d4f75..375de63ae82e 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.c
+++ b/sys/dev/aic7xxx/aic79xx_osm.c
@@ -83,11 +83,13 @@ static const char *ahd_sysctl_node_elements[] = {
 	"debug"
 };
 
+#ifndef NO_SYSCTL_DESCR
 static const char *ahd_sysctl_node_descriptions[] = {
 	"root error collection for aic79xx controllers",
 	"summary collection for aic79xx controllers",
 	"debug collection for aic79xx controllers"
 };
+#endif
 
 static const char *ahd_sysctl_errors_elements[] = {
 	"Cerrors",
@@ -95,11 +97,13 @@ static const char *ahd_sysctl_errors_elements[] = {
 	"Ferrors"
 };
 
+#ifndef NO_SYSCTL_DESCR
 static const char *ahd_sysctl_errors_descriptions[] = {
 	"Correctable errors",
 	"Uncorrectable errors",
 	"Fatal errors"
 };
+#endif
 
 static int
 ahd_set_debugcounters(SYSCTL_HANDLER_ARGS)