diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index ec3428b5a..ea8ad1c78 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <article>
-  <!--$Id$-->
+  <!--/$Id$-->
 
   <articleinfo>
     <title>Shorewall 4.x Documentation</title>
@@ -140,7 +140,8 @@
           </row>
 
           <row>
-            <entry>Commands</entry>
+            <entry><ulink
+            url="starting_and_stopping_shorewall.htm">Commands</ulink></entry>
 
             <entry><ulink url="XenMyWay-Routed.html">My Shorewall
             Configuration</ulink></entry>
@@ -150,8 +151,8 @@
           </row>
 
           <row>
-            <entry><ulink url="starting_and_stopping_shorewall.htm">Compiled
-            Firewall Programs</ulink></entry>
+            <entry><ulink url="CompiledPrograms.html">Compiled Firewall
+            Programs</ulink></entry>
 
             <entry><ulink url="NetfilterOverview.html">Netfilter
             Overview</ulink></entry>
@@ -162,8 +163,9 @@
           </row>
 
           <row>
-            <entry><ulink url="CompiledPrograms.html">Configuration File
-            Basics</ulink></entry>
+            <entry><ulink
+            url="http://www.shorewall.net/configuration_file_basics.html">Configuration
+            File Basics</ulink></entry>
 
             <entry><ulink url="netmap.html">Network Mapping</ulink></entry>
 
@@ -172,8 +174,7 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="configuration_file_basics.htm">DHCP</ulink></entry>
+            <entry><ulink url="dhcp.htm">DHCP</ulink></entry>
 
             <entry><ulink url="NAT.htm">One-to-one NAT</ulink> (Static
             NAT)</entry>
@@ -194,7 +195,8 @@
           </row>
 
           <row>
-            <entry>ECN Disabling by host or subnet</entry>
+            <entry><ulink url="ECN.html">ECN Disabling by host or
+            subnet</ulink></entry>
 
             <entry><ulink url="starting_and_stopping_shorewall.htm">Operating
             Shorewall</ulink></entry>