diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index b88a9dc64be..1496afcefc9 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -41,6 +41,11 @@ removable_interfaces=""	# Removable network interfaces for /etc/pccard_ether.
 local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
 script_name_sep=" "	# Change if your startup scripts' names contain spaces
 rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
+
+# Experimental - test before enabling
+gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab
+gbde_devices="NO" 	# Devices to automatically attach (list, or AUTO)
+
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index f77b5a921c4..fe18dd57747 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -917,6 +917,18 @@ By default, the files specified are
 .Pa /etc/rc.conf
 and
 .Pa /etc/rc.conf.local
+.It Va gbde_autoattach_all
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+.Pa /etc/rc.d/gbde
+will attempt to automatically initialize your .bde devices in
+.Pa /etc/fstab .
+.It Va gbde_devices
+.Pq Vt str
+List the devices that the script should try to attach,
+or
+.Dq Li AUTO .
 .It Va fsck_y_enable
 .Pq Vt bool
 If set to