diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
index c2ee507519..9050eeb5e2 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
@@ -3566,7 +3566,7 @@ Password:</screen>
 	    initialized before it can be used. This initialization needs to
 	    be performed only once:</para>
 
-	  <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c</userinput></screen>
+	  <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	  <para>&man.gbde.8; will open your editor, permitting you to set
 	    various configuration options in a template. For use with UFS1
@@ -3598,7 +3598,11 @@ sector_size     =       2048
 	  <para>The <command>gbde init</command> command creates a lock
 	    file for your <application>gbde</application> partition that in
 	    this example is stored as
-	    <filename>/etc/gbde/ad4s1c</filename>.</para>
+	    <filename>/etc/gbde/ad4s1c.lock</filename>.
+	    <application>gbde</application> lock files must end in
+	    <quote>.lock</quote> in order to be correctly detected by
+	    the <application>gbde</application>
+	    <filename>/etc/rc.d/gbde</filename> start up script.</para>
 
 	  <caution>
 	    <para><application>gbde</application> lock files
@@ -3616,7 +3620,7 @@ sector_size     =       2048
 	<step>
 	  <title>Attach the Encrypted Partition to the Kernel</title>
 
-	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c</userinput></screen>
+	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	  <para> You will be asked to provide the passphrase that you
 	    selected during the initialization of the encrypted partition.
@@ -3693,7 +3697,7 @@ Filesystem        Size   Used  Avail Capacity  Mounted on
 	<step>
 	  <title>Attach the gbde Partition to the Kernel</title>
 
-	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c</userinput></screen>
+	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	  <para>You will be asked to provide the passphrase that you
 	    selected during initialization of the encrypted
@@ -3734,7 +3738,8 @@ Filesystem        Size   Used  Avail Capacity  Mounted on
 	  &man.rc.conf.5;, for example:</para>
 
 	<programlisting>gbde_autoattach_all="YES"
-gbde_devices="ad4s1c"</programlisting>
+gbde_devices="ad4s1c"
+gbde_lockdir="/etc/gbde"</programlisting>
 
 	<para>This will require that the <application>gbde</application>
 	  passphrase be entered at boot time.  After typing the correct