diff --git a/docs/Manpages.xml b/docs/Manpages.xml
index 71cfadccb..8e4ecc876 100644
--- a/docs/Manpages.xml
+++ b/docs/Manpages.xml
@@ -5,7 +5,7 @@
   <!--$Id: template.xml 5908 2007-04-12 23:04:36Z teastep $-->
 
   <articleinfo>
-    <title>Shorewall 4.4 Manpages</title>
+    <title>Shorewall 4.4-4.6 Manpages</title>
 
     <authorgroup>
       <author>
@@ -18,19 +18,7 @@
     <pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
 
     <copyright>
-      <year>2007</year>
-
-      <year>2008</year>
-
-      <year>2009</year>
-
-      <year>2010</year>
-
-      <year>2011</year>
-
-      <year>2012</year>
-
-      <year>2013</year>
+      <year>2007-2014</year>
 
       <holder>Thomas M. Eastep</holder>
     </copyright>
@@ -47,19 +35,10 @@
   </articleinfo>
 
   <warning>
-    <para>These manpages are for Shorewall 4.0 only. They describe features
-    and options not available on earlier releases.</para>
+    <para>These manpages are for Shorewall 4.4 and later only. They describe
+    features and options not available on earlier releases.</para>
   </warning>
 
-  <note>
-    <para>The docbook to manpage translation tool that we are using has some
-    indentation issues which require us to choose between correct output of
-    the man command and correctly-indented HTML. We've chosen in favor of the
-    man command so some of the manpages accessed through the links below have
-    indentation problems. We're working to resolve these issues and ask for
-    your patience.</para>
-  </note>
-
   <section id="Section5">
     <title>Section 5 — Files and Concepts</title>
 
@@ -79,9 +58,8 @@
         url="manpages/shorewall-blacklist.html">blacklist</ulink> - Static
         blacklisting (deprecated)</member>
 
-        <member><ulink
-        url="manpages/shorewall-blrules.html">blrules</ulink> - shorewall
-        Blacklist file.</member>
+        <member><ulink url="manpages/shorewall-blrules.html">blrules</ulink> -
+        shorewall Blacklist file.</member>
 
         <member><ulink
         url="manpages/shorewall-conntrack.html">conntrack</ulink> - Specify
@@ -154,7 +132,9 @@
         <member><ulink
         url="manpages/shorewall-routestopped.html">routestopped</ulink> -
         Specify connections to be permitted when Shorewall is in the stopped
-        state (deprecated in Shorewall 4.5.8).</member>
+        state (deprecated in Shorewall 4.5.8 in favor of the <ulink
+        url="manpages/shorewall-stoppedrules.html">stoppedrules</ulink>
+        file).</member>
 
         <member><ulink url="manpages/shorewall-rules.html">rules</ulink> -
         Specify exceptions to policies, including DNAT and REDIRECT.</member>
diff --git a/docs/Manpages6.xml b/docs/Manpages6.xml
index a36128138..e595003e1 100644
--- a/docs/Manpages6.xml
+++ b/docs/Manpages6.xml
@@ -5,7 +5,7 @@
   <!--$Id: template.xml 5908 2007-04-12 23:04:36Z teastep $-->
 
   <articleinfo>
-    <title>Shorewall6 4.4 Manpages</title>
+    <title>Shorewall6 4.4-4.6 Manpages</title>
 
     <authorgroup>
       <author>
@@ -18,13 +18,7 @@
     <pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
 
     <copyright>
-      <year>2007</year>
-
-      <year>2008</year>
-
-      <year>2009</year>
-
-      <year>2010</year>
+      <year>2007-2014</year>
 
       <holder>Thomas M. Eastep</holder>
     </copyright>
@@ -41,19 +35,10 @@
   </articleinfo>
 
   <warning>
-    <para>These manpages are for Shorewall6 4.0 only. They describe features
-    and options not available on earlier releases.</para>
+    <para>These manpages are for Shorewall6 4.4 and later only. They describe
+    features and options not available on earlier releases.</para>
   </warning>
 
-  <note>
-    <para>The docbook to manpage translation tool that we are using has some
-    indentation issues which require us to choose between correct output of
-    the man command and correctly-indented HTML. We've chosen in favor of the
-    man command so some of the manpages accessed through the links below have
-    indentation problems. We're working to resolve these issues and ask for
-    your patience.</para>
-  </note>
-
   <section id="Section5">
     <title>Section 5 — Files and Concepts</title>
 
@@ -70,9 +55,8 @@
         url="manpages6/shorewall6-blacklist.html">blacklist</ulink> - Static
         blacklisting (deprecated)</member>
 
-        <member><ulink
-        url="manpages6/shorewall6-blrules.html">blrules</ulink> - shorewall6
-        Blacklist file.</member>
+        <member><ulink url="manpages6/shorewall6-blrules.html">blrules</ulink>
+        - shorewall6 Blacklist file.</member>
 
         <member><ulink
         url="manpages6/shorewall6-conntrack.html">conntrack</ulink> - Specify