diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index b01bdd02a6..eb8f104eef 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -483,6 +483,12 @@ host2.example.com link#1             UC          0        0
     </sect1info>
     <title>Wireless</title>
 
+   <indexterm><primary>wireless networking</primary></indexterm>
+   <indexterm>
+     <primary>802.11</primary>
+     <see>wireless networking</see>
+   </indexterm>
+
    <sect2>
       <title>Introduction</title>
       <para>It can be very useful to be able to use a computer without the
@@ -546,6 +552,9 @@ host2.example.com link#1             UC          0        0
 
      <sect3>
        <title>Building a FreeBSD Access Point</title>
+       <indexterm><primary>wireless networking</primary>
+         <secondary>access point</secondary>
+       </indexterm>
 
        <sect4><title>Requirements</title>
          <para>In order to set up a wireless access point with FreeBSD, you need to have
@@ -716,6 +725,10 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
 
      <sect3>
       <title>Encryption</title>
+      <indexterm>
+        <primary>wireless networking</primary>
+        <secondary>encryption</secondary>
+      </indexterm>
 
       <para>Encryption on a wireless network is important because you no longer have the
        ability to keep the network contained in a well protected area.  Your wireless data
@@ -729,6 +742,8 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
 
      <sect4>
      <title>WEP</title>
+      <indexterm><primary>WEP</primary></indexterm>
+
       <para>WEP is an abbreviation for Wired Equivalency Protocol.  WEP is an attempt to
        make wireless networks as safe and secure as a wired network.  Unfortunately, it
        has been cracked, and is fairly trivial to break.  This also means it is not something
@@ -790,6 +805,8 @@ wi0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
 
     <sect4>
     <title>ifconfig</title>
+    <indexterm><primary>ifconfig</primary></indexterm>
+
     <para>&man.ifconfig.8; can be used to do many of the same options as &man.wicontrol.8;, however it
     does lack a few options.  Check &man.ifconfig.8; for command line parameters and options.</para>