diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml
index a757e51d3..6f26eca63 100644
--- a/docs/Documentation_Index.xml
+++ b/docs/Documentation_Index.xml
@@ -57,58 +57,6 @@
           <row>
             <entry><ulink url="Accounting.html">Accounting</ulink></entry>
 
-            <entry></entry>
-
-            <entry><ulink
-            url="shorewall_prerequisites.htm">Requirements</ulink></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="Actions.html">Actions</ulink></entry>
-
-            <entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
-            Shorewall 2.1 or Later</ulink></entry>
-
-            <entry><ulink url="Shorewall_and_Routing.html">Routing and
-            Shorewall</ulink></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
-            (virtual) Interfaces (e.g., eth0:0)</ulink></entry>
-
-            <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
-
-            <entry><ulink url="Multiple_Zones.html">Routing on One
-            Interface</ulink></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="Anatomy.html">Anatomy of
-            Shorewall</ulink></entry>
-
-            <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
-            Filtering</ulink></entry>
-
-            <entry><ulink url="samba.htm">Samba</ulink></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="traffic_shaping.htm">Bandwidth Control</ulink>
-            (<ulink url="traffic_shaping_ru.html">Russian</ulink>)</entry>
-
-            <entry><ulink url="kernel.htm">Kernel
-            Configuration</ulink></entry>
-
-            <entry><ulink url="ScalabilityAndPerformance.html">Scalability and
-            Performance</ulink></entry>
-          </row>
-
-          <row>
-            <entry><ulink url="blacklisting_support.htm">Blacklisting</ulink>
-            (<ulink
-            url="blacklisting_support_ru.html">Russian</ulink>)</entry>
-
             <entry><ulink url="PortKnocking.html#Limit">Limiting per-IPaddress
             Connection Rate</ulink></entry>
 
@@ -117,8 +65,7 @@
           </row>
 
           <row>
-            <entry>Bridge: <ulink
-            url="bridge-Shorewall-perl.html">Shorewall-perl</ulink></entry>
+            <entry><ulink url="Actions.html">Actions</ulink></entry>
 
             <entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
 
@@ -127,8 +74,8 @@
           </row>
 
           <row>
-            <entry>Bridge: <ulink url="SimpleBridge.html">No control of
-            traffic through the bridge</ulink></entry>
+            <entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
+            (virtual) Interfaces (e.g., eth0:0)</ulink></entry>
 
             <entry><ulink url="Macros.html">Macros</ulink></entry>
 
@@ -137,8 +84,8 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="starting_and_stopping_shorewall.htm">Commands</ulink></entry>
+            <entry><ulink url="Anatomy.html">Anatomy of
+            Shorewall</ulink></entry>
 
             <entry><ulink url="MAC_Validation.html">MAC
             Verification</ulink></entry>
@@ -148,8 +95,8 @@
           </row>
 
           <row>
-            <entry><ulink url="CompiledPrograms.html">Compiled Firewall
-            Programs</ulink></entry>
+            <entry><ulink url="traffic_shaping.htm">Bandwidth Control</ulink>
+            (<ulink url="traffic_shaping_ru.html">Russian</ulink>)</entry>
 
             <entry><ulink url="manpages/Manpages.html">Man
             Pages</ulink></entry>
@@ -158,8 +105,9 @@
           </row>
 
           <row>
-            <entry><ulink url="configuration_file_basics.htm">Configuration
-            File Basics</ulink></entry>
+            <entry><ulink url="blacklisting_support.htm">Blacklisting</ulink>
+            (<ulink
+            url="blacklisting_support_ru.html">Russian</ulink>)</entry>
 
             <entry><ulink url="MultiISP.html">Multiple Internet Connections
             from a Single Firewall</ulink> (<ulink
@@ -170,7 +118,8 @@
           </row>
 
           <row>
-            <entry><ulink url="dhcp.htm">DHCP</ulink></entry>
+            <entry>Bridge: <ulink
+            url="bridge-Shorewall-perl.html">Shorewall-perl</ulink></entry>
 
             <entry><ulink url="Multiple_Zones.html">Multiple Zones Through One
             Interface</ulink></entry>
@@ -181,8 +130,8 @@
           </row>
 
           <row>
-            <entry><ulink url="ECN.html">ECN Disabling by host or
-            subnet</ulink></entry>
+            <entry>Bridge: <ulink url="SimpleBridge.html">No control of
+            traffic through the bridge</ulink></entry>
 
             <entry><ulink url="XenMyWay-Routed.html">My Shorewall
             Configuration</ulink></entry>
@@ -192,8 +141,8 @@
           </row>
 
           <row>
-            <entry><ulink url="shorewall_extension_scripts.htm">Extension
-            Scripts</ulink> (User Exits)</entry>
+            <entry><ulink
+            url="starting_and_stopping_shorewall.htm">Commands</ulink></entry>
 
             <entry><ulink url="NetfilterOverview.html">Netfilter
             Overview</ulink></entry>
@@ -202,8 +151,8 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="fallback.htm">Fallback/Uninstall</ulink></entry>
+            <entry><ulink url="CompiledPrograms.html">Compiled Firewall
+            Programs</ulink></entry>
 
             <entry><ulink url="netmap.html">Network Mapping</ulink></entry>
 
@@ -212,7 +161,8 @@
           </row>
 
           <row>
-            <entry><ulink url="FAQ.htm">FAQs</ulink></entry>
+            <entry><ulink url="configuration_file_basics.htm">Configuration
+            File Basics</ulink></entry>
 
             <entry><ulink url="NAT.htm">One-to-one NAT</ulink> (Static
             NAT)</entry>
@@ -223,18 +173,18 @@
           </row>
 
           <row>
-            <entry><ulink
-            url="shorewall_features.htm">Features</ulink></entry>
+            <entry><ulink url="dhcp.htm">DHCP</ulink></entry>
 
-            <entry><ulink url="OPENVPN.html">OpenVPN</ulink></entry>
+            <entry><ulink url="Multiple_Zones.html"><ulink
+            url="OPENVPN.html">OpenVPN</ulink></ulink></entry>
 
             <entry><ulink
             url="troubleshoot.htm">Troubleshooting</ulink></entry>
           </row>
 
           <row>
-            <entry><ulink url="Multiple_Zones.html">Forwarding Traffic on the
-            Same Interface</ulink></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>
@@ -243,7 +193,8 @@
           </row>
 
           <row>
-            <entry><ulink url="FTP.html">FTP and Shorewall</ulink></entry>
+            <entry><ulink url="shorewall_extension_scripts.htm">Extension
+            Scripts</ulink> (User Exits)</entry>
 
             <entry><ulink url="PacketMarking.html">Packet
             Marking</ulink></entry>
@@ -253,8 +204,8 @@
           </row>
 
           <row>
-            <entry><ulink url="support.htm">Getting help or answers to
-            questions</ulink></entry>
+            <entry><ulink
+            url="fallback.htm">Fallback/Uninstall</ulink></entry>
 
             <entry><ulink url="PacketHandling.html">Packet Processing in a
             Shorewall-based Firewall</ulink></entry>
@@ -263,8 +214,7 @@
           </row>
 
           <row>
-            <entry><ulink url="Install.htm">Installation/Upgrade</ulink>
-            (<ulink url="Install_fr.html">Français</ulink>)</entry>
+            <entry><ulink url="FAQ.htm">FAQs</ulink></entry>
 
             <entry><ulink url="ping.html">'Ping' Management</ulink></entry>
 
@@ -273,7 +223,8 @@
           </row>
 
           <row>
-            <entry><ulink url="IPP2P.html">IPP2P</ulink></entry>
+            <entry><ulink
+            url="shorewall_features.htm">Features</ulink></entry>
 
             <entry><ulink url="ports.htm">Port Information</ulink></entry>
 
@@ -282,7 +233,8 @@
           </row>
 
           <row>
-            <entry></entry>
+            <entry><ulink url="Multiple_Zones.html">Forwarding Traffic on the
+            Same Interface</ulink></entry>
 
             <entry><ulink url="PortKnocking.html">Port Knocking and Other Uses
             of the 'Recent Match'</ulink></entry>
@@ -292,7 +244,7 @@
           </row>
 
           <row>
-            <entry></entry>
+            <entry><ulink url="FTP.html">FTP and Shorewall</ulink></entry>
 
             <entry><ulink url="PPTP.htm">PPTP</ulink></entry>
 
@@ -301,7 +253,8 @@
           </row>
 
           <row>
-            <entry></entry>
+            <entry><ulink url="support.htm">Getting help or answers to
+            questions</ulink></entry>
 
             <entry><ulink url="ProxyARP.htm">Proxy ARP</ulink></entry>
 
@@ -309,13 +262,61 @@
           </row>
 
           <row>
-            <entry></entry>
+            <entry><ulink url="Install.htm">Installation/Upgrade</ulink>
+            (<ulink url="Install_fr.html">Français</ulink>)</entry>
 
             <entry><ulink url="ReleaseModel.html">Release
             Model</ulink></entry>
 
             <entry></entry>
           </row>
+
+          <row>
+            <entry><ulink url="IPP2P.html">IPP2P</ulink></entry>
+
+            <entry><ulink
+            url="shorewall_prerequisites.htm">Requirements</ulink></entry>
+
+            <entry></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
+            Shorewall 2.1 or Later</ulink></entry>
+
+            <entry><ulink url="Shorewall_and_Routing.html">Routing and
+            Shorewall</ulink></entry>
+
+            <entry></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="ipsets.html">Ipsets</ulink></entry>
+
+            <entry><ulink url="Multiple_Zones.html">Routing on One
+            Interface</ulink></entry>
+
+            <entry></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
+            Filtering</ulink></entry>
+
+            <entry><ulink url="samba.htm">Samba</ulink></entry>
+
+            <entry></entry>
+          </row>
+
+          <row>
+            <entry><ulink url="kernel.htm">Kernel
+            Configuration</ulink></entry>
+
+            <entry><ulink url="ScalabilityAndPerformance.html">Scalability and
+            Performance</ulink></entry>
+
+            <entry></entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable>
diff --git a/manpages/shorewall-masq.xml b/manpages/shorewall-masq.xml
index dedfb0a97..deeb69954 100644
--- a/manpages/shorewall-masq.xml
+++ b/manpages/shorewall-masq.xml
@@ -173,7 +173,10 @@
 
           <para>If the <option>nodst:</option> option is included, then the
           same source address is used for a given internal system regardless
-          of which remote system is involved.</para>
+          of which remote system is involved.<warning>
+              <para>Support for the SAME target is scheduled for removal from
+              the Linux kernel in 2008.</para>
+            </warning></para>
 
           <para>If you want to leave this column empty but you need to specify
           the next column then place a hyphen ("-") here.</para>
diff --git a/manpages/shorewall-rules.xml b/manpages/shorewall-rules.xml
index 52d4df621..2edb31bf2 100644
--- a/manpages/shorewall-rules.xml
+++ b/manpages/shorewall-rules.xml
@@ -243,7 +243,10 @@
                 <para>Similar to <emphasis role="bold">DNAT</emphasis> except
                 that the port may not be remapped and when multiple server
                 addresses are listed, all requests from a given remote system
-                go to the same server.</para>
+                go to the same server.<warning>
+                    <para>Support for SAME is scheduled for removal from the
+                    Linux kernel in 2008.</para>
+                  </warning></para>
               </listitem>
             </varlistentry>