diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 87a5471e92..2a653ec738 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -511,7 +511,10 @@ cpu          EV5</programlisting>
       machine.</para>
 
     <para>Starting with FreeBSD 4.5, the system will auto-tune this setting
-      for you if you explicitly set it to <literal>0</literal>.  If you are
+      for you if you explicitly set it to <literal>0</literal><footnote>
+	<para>The auto-tuning algorithm sets <literal>maxuser</literal> equal
+	  to the amount of memory in the system, with a minimum of 32, and a
+	  maximum of 512.</para></footnote>.  If you are
       using an earlier version of FreeBSD, or you want to manage it
       yourself you will want to set
       <literal>maxusers</literal> to at least 4, especially if you are
@@ -598,6 +601,15 @@ options          FFS_ROOT     #FFS usable as root device [keep this!]</programli
     <para>This is the basic hard drive filesystem.  Leave it in if you
       boot from the hard disk.</para>
 
+    <programlisting>options          UFS_DIRHASH  #Improve performance on big directories</programlisting>
+
+    <para>This option includes some code to speed up disk operations on large
+      directories, at the expense of using a some additional memory.  You
+      would normally keep this for a large server, or interactive workstation,
+      and remove it if you are using FreeBSD on a smaller system where memory
+      is at a premium and disk access speed is less important, such as a
+      firewall.</para>
+
     <programlisting>options          MFS          #Memory Filesystem
 options          MD_ROOT      #MD is a potential root device</programlisting>
 
@@ -1099,11 +1111,18 @@ pseudo-device   pty           # Pseudo-ttys (telnet etc)</programlisting>
 
     <para>Memory disk pseudo-devices.</para>
 
+    <programlisting>pesudo-device   gif</programlisting>
+
+    <para>or</para>
+
     <programlisting>pseudo-device   gif     4     # IPv6 and IPv4 tunneling</programlisting>
 
-    <para>This implements IPv6 over IPv4 tunneling, IPv4 over IPv6
-      tunneling, IPv4 over IPv4 tunneling, and IPv6 over IPv6
-      tunneling.</para>
+    <para>This implements IPv6 over IPv4 tunneling, IPv4 over IPv6 tunneling,
+      IPv4 over IPv4 tunneling, and IPv6 over IPv6 tunneling.  Beginning with
+      FreeBSD 4.4 the <literal>gif</literal> device is
+      <quote>auto-cloning</quote>, and you should use the first example
+      (without the number after <literal>gif</literal>).  Earlier versions of
+      FreeBSD require the number.</para>
 
     <programlisting>pseudo-device   faith   1     # IPv6-to-IPv4 relaying (translation)</programlisting>