diff --git a/Shorewall-docs/IPIP.xml b/Shorewall-docs/IPIP.xml
index 8ce87ee7a..c220f0d5d 100644
--- a/Shorewall-docs/IPIP.xml
+++ b/Shorewall-docs/IPIP.xml
@@ -30,8 +30,8 @@
       document under the terms of the GNU Free Documentation License, Version
       1.2 or any later version published by the Free Software Foundation; with
       no Invariant Sections, with no Front-Cover, and with no Back-Cover
-      Texts. A copy of the license is included in the section entitled &#34;<ulink
-      url="GnuCopyright.htm">GNU Free Documentation License</ulink>&#34;.</para>
+      Texts. A copy of the license is included in the section entitled
+      <quote><ulink url="GnuCopyright.htm">GNU Free Documentation License</ulink></quote>.</para>
     </legalnotice>
   </articleinfo>
 
@@ -43,11 +43,11 @@
   <para>GRE and IPIP tunneling with Shorewall can be used to bridge two
   masqueraded networks.</para>
 
-  <para>The simple scripts described in the <ulink url="http://ds9a.nl/lartc">Linux
-  Advanced Routing and Shaping HOWTO</ulink> work fine with Shorewall.
-  Shorewall also includes a tunnel script for automating tunnel configuration.
-  If you have installed the RPM, the tunnel script may be found in the
-  Shorewall documentation directory (usually
+  <para>The simple scripts described in the <citetitle><ulink
+  url="http://ds9a.nl/lartc">Linux Advanced Routing and Shaping HOWTO</ulink></citetitle>
+  work fine with Shorewall. Shorewall also includes a tunnel script for
+  automating tunnel configuration. If you have installed the RPM, the tunnel
+  script may be found in the Shorewall documentation directory (usually
   /usr/share/doc/shorewall-&#60;version&#62;/).</para>
 
   <section>
@@ -271,9 +271,9 @@ subnet=192.168.1.0/24</programlisting>
     <para>You can rename the modified tunnel scripts if you like; be sure that
     they are secured so that root can execute them.</para>
 
-    <para>You will need to allow traffic between the &#34;vpn&#34; zone and
-    the &#34;loc&#34; zone on both systems -- if you simply want to admit all
-    traffic in both directions, you can use the policy file:</para>
+    <para>You will need to allow traffic between the <quote>vpn</quote> zone
+    and the <quote>loc</quote> zone on both systems -- if you simply want to
+    admit all traffic in both directions, you can use the policy file:</para>
 
     <table>
       <title>/etc/shorewall/policy system A &#38; B</title>
@@ -316,7 +316,7 @@ subnet=192.168.1.0/24</programlisting>
     </table>
 
     <para>On both systems, restart Shorewall and run the modified tunnel
-    script with the &#34;start&#34; argument on each system. The systems in
-    the two masqueraded subnetworks can now talk to each other</para>
+    script with the <quote>start</quote> argument on each system. The systems
+    in the two masqueraded subnetworks can now talk to each other</para>
   </section>
 </article>
\ No newline at end of file
diff --git a/Shorewall-docs/template.xml b/Shorewall-docs/template.xml
index fbf649033..fd674a8e5 100644
--- a/Shorewall-docs/template.xml
+++ b/Shorewall-docs/template.xml
@@ -30,8 +30,8 @@
       document under the terms of the GNU Free Documentation License, Version
       1.2 or any later version published by the Free Software Foundation; with
       no Invariant Sections, with no Front-Cover, and with no Back-Cover
-      Texts. A copy of the license is included in the section entitled &#34;<ulink
-      url="GnuCopyright.htm">GNU Free Documentation License</ulink>&#34;.</para>
+      Texts. A copy of the license is included in the section entitled
+      <quote><ulink url="GnuCopyright.htm">GNU Free Documentation License</ulink></quote>.</para>
     </legalnotice>
   </articleinfo>