diff --git a/Shorewall-Website/Shorewall_index_frame.htm b/Shorewall-Website/Shorewall_index_frame.htm
index 3bd6be2f7..e5086e10e 100644
--- a/Shorewall-Website/Shorewall_index_frame.htm
+++ b/Shorewall-Website/Shorewall_index_frame.htm
@@ -7,7 +7,7 @@
   <base target="main">
 </head>
 <body style="background-color: rgb(51, 102, 255); color: rgb(0, 0, 0);"
- link="#0000ee" alink="#0000ee" vlink="#551a8b">
+ alink="#0000ee" link="#0000ee" vlink="#551a8b">
 <a href="index.htm" target="_top" style="font-weight: bold;"><font
  color="#ffffff">Home</font></a><font color="#ffffff"><br>
 <a href="Introduction.html" style="color: rgb(255, 255, 255);"><span
@@ -29,9 +29,9 @@
  style="font-weight: bold;">Troubleshooting</span></font></a><font
  color="#ffffff"><br>
 <a href="support.htm"><font color="#ffffff"><span
- style="font-weight: bold;">Support</span></font></a><font
- color="#ffffff"><br>
-<br>
+ style="font-weight: bold;">Support</span></font></a> (Read this before
+asking for help)<br>
+<font color="#ffffff"><br>
 <a href="shoreline.htm"><font color="#ffffff">About the Author</font></a><font
  color="#ffffff"> <br>
 <a href="http://cvs.shorewall.net/Shorewall_CVS_Access.html"><font
diff --git a/Shorewall-Website/Shorewall_sfindex_frame.htm b/Shorewall-Website/Shorewall_sfindex_frame.htm
index f78ab1fab..00632ae45 100644
--- a/Shorewall-Website/Shorewall_sfindex_frame.htm
+++ b/Shorewall-Website/Shorewall_sfindex_frame.htm
@@ -1,92 +1,106 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-  <meta http-equiv="Content-Language" content="en-us">
-  <meta http-equiv="Content-Type"
- content="text/html; charset=windows-1252">
-  <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-  <meta name="ProgId" content="FrontPage.Editor.Document">
+  <meta content="en-us" http-equiv="Content-Language">
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
   <title>Shorewall Index</title>
   <base target="main">
-  <meta name="Microsoft Theme" content="none">
 </head>
 <body style="background-color: rgb(51, 102, 255); color: rgb(0, 0, 0);"
- link="#0000ee" alink="#0000ee" vlink="#551a8b">
-<a href="index.htm" target="_top" style="color: rgb(255, 255, 255);">Home</a><br
- style="color: rgb(255, 255, 255);">
-<a href="Introduction.html" style="color: rgb(255, 255, 255);">Introduction</a><br
- style="color: rgb(255, 255, 255);">
-<a href="download.htm" style="color: rgb(255, 255, 255);">Download</a><br
- style="color: rgb(255, 255, 255);">
-<a href="Install.htm" style="color: rgb(255, 255, 255);"><span
- style="font-weight: bold;">Installation</span></a><a href="Install.htm"
- style="color: rgb(255, 255, 255);"><span
- style="color: rgb(255, 255, 255);"> </span></a><br>
-<a href="Documentation.htm" style="color: rgb(255, 255, 255);"
- font-weight="" bold=""><span ="">Documentation</span></a><br
- style="color: rgb(255, 255, 255);">
-<a href="FAQ.htm" style="color: rgb(255, 255, 255);"><span
- style="font-weight: bold;">FAQ</span>s</a><span
- style="color: rgb(255, 255, 255);">&nbsp;
-(</span><a
+ alink="#0000ee" link="#0000ee" vlink="#551a8b">
+<a href="index.htm" target="_top" style="font-weight: bold;"><font
+ color="#ffffff">Home</font></a><font color="#ffffff"><br>
+<a href="Introduction.html" style="color: rgb(255, 255, 255);"><span
+ style="font-weight: bold;">Introduction</span></a><br>
+<a href="download.htm" style="font-weight: bold;"><font color="#ffffff">Download</font></a><font
+ color="#ffffff"><br>
+<a href="Install.htm"><span style="font-weight: bold;"><font
+ color="#ffffff">Installation</font></span></a>
+<font color="#ffffff"><br>
+<b><a href="Documentation_Index.html"><font color="#ffffff">Documentation</font></a></b><font
+ color="#ffffff"><br>
+<a href="FAQ.htm"><font color="#ffffff"><span style="font-weight: bold;">FAQ</span>s</font></a><font
+ color="#ffffff">&nbsp;
+<span style="font-weight: bold;">(</span><a
  href="http://wiki.rettc.com/wiki.phtml?title=Wiki_Shorewall_FAQ"
- target="_top" style="color: rgb(255, 255, 255);">Wiki</a><span
- style="color: rgb(255, 255, 255);">)</span><br
- style="color: rgb(255, 255, 255);">
-<a href="troubleshoot.htm" style="color: rgb(255, 255, 255);"><span
- style="font-weight: bold;">Troubleshooting</span></a><br
- style="color: rgb(255, 255, 255);">
-<a href="support.htm" style="color: rgb(255, 255, 255);"><span
- style="font-weight: bold;">Support</span></a><a href="support.htm"
- style="color: rgb(255, 255, 255);"><span
- style="color: rgb(255, 255, 255);">
-</span></a><br style="color: rgb(255, 255, 255);">
-<a href="shorewall_features.htm" style="color: rgb(255, 255, 255);">Features</a><br
- style="color: rgb(255, 255, 255);">
-<a href="Shorewall_Doesnt.html" style="color: rgb(255, 255, 255);">What
-it
-Cannot Do</a><span style="color: rgb(255, 255, 255);"> </span><br
- style="color: rgb(255, 255, 255);">
-<a href="shorewall_prerequisites.htm" style="color: rgb(255, 255, 255);">Requirements</a><br
- style="color: rgb(255, 255, 255);">
-<a href="http://lists.shorewall.net" style="color: rgb(255, 255, 255);">Mailing
-Lists</a><a href="http://lists.shorewall.net"
- style="color: rgb(255, 255, 255);"> </a> <br
- style="color: rgb(255, 255, 255);">
-<a href="upgrade_issues.htm" style="color: rgb(255, 255, 255);">Upgrade
-Issues</a><br style="color: rgb(255, 255, 255);">
-<a href="errata.htm" style="color: rgb(255, 255, 255);">Errata</a><br
- style="color: rgb(255, 255, 255);">
-<a href="shorewall_mirrors.htm" style="color: rgb(255, 255, 255);">Mirrors</a><span
- style="color: rgb(255, 255, 255);"> </span><br
- style="color: rgb(255, 255, 255);">
-<a href="News.htm" style="color: rgb(255, 255, 255);">News
-Archive</a><br style="color: rgb(255, 255, 255);">
-<a href="http://cvs.shorewall.net/Shorewall_CVS_Access.html"
- style="color: rgb(255, 255, 255);">CVS
-Repository</a><br style="color: rgb(255, 255, 255);">
-<a href="quotes.htm" style="color: rgb(255, 255, 255);">Quotes
-from Users</a><br style="color: rgb(255, 255, 255);">
-<a href="useful_links.html" style="color: rgb(255, 255, 255);">Useful
-Links</a><br style="color: rgb(255, 255, 255);">
-<a href="shoreline.htm" style="color: rgb(255, 255, 255);">About
-the Author</a><br style="color: rgb(255, 255, 255);">
-<a href="shorewall_index.htm#Donations"
- style="color: rgb(255, 255, 255);">Donations</a>
-<ul style="color: rgb(255, 255, 255);">
+ target="_top" style="font-weight: bold;"><font color="#ffffff">Wiki</font></a><font
+ color="#ffffff"><span style="font-weight: bold;">)</span><br>
+<a href="troubleshoot.htm"><font color="#ffffff"><span
+ style="font-weight: bold;">Troubleshooting</span></font></a><font
+ color="#ffffff"><br>
+<a href="support.htm"><font color="#ffffff"><span
+ style="font-weight: bold;">Support</span></font></a> (Read this before
+asking for help)<br>
+<font color="#ffffff"><br>
+<a href="shoreline.htm"><font color="#ffffff">About the Author</font></a><font
+ color="#ffffff"> <br>
+<a href="http://cvs.shorewall.net/Shorewall_CVS_Access.html"><font
+ color="#ffffff">CVS
+Repository</font></a><font color="#ffffff"><br>
+<a href="shorewall_index.htm#Donations"><font color="#ffffff">Donations</font></a><font
+ color="#ffffff"><br>
+<a href="errata.htm"><font color="#ffffff">Errata</font></a><font
+ color="#ffffff"><br>
+<a href="shorewall_features.htm"><font color="#ffffff">Features</font></a><font
+ color="#ffffff"> <br>
+<a href="http://lists.shorewall.net"><font color="#ffffff">Mailing
+Lists</font></a><font color="#ffffff"><a
+ href="http://lists.shorewall.net"> </a> <br>
+<a href="shorewall_mirrors.htm"><font color="#ffffff">Mirrors</font></a><font
+ color="#ffffff"> <br>
+<a href="News.htm"><font color="#ffffff">News Archive</font></a><font
+ color="#ffffff"><br>
+<a href="quotes.htm"><font color="#ffffff">Quotes from Users</font></a><font
+ color="#ffffff"><br>
+<a href="shorewall_prerequisites.htm"><font color="#ffffff">Requirements</font></a><font
+ color="#ffffff"><br>
+<a href="upgrade_issues.htm"><font color="#ffffff">Upgrade
+Issues</font></a><font color="#ffffff"><br>
+<a href="useful_links.html"><font color="#ffffff">Useful Links</font></a><font
+ color="#ffffff"><br>
+<a href="Shorewall_Doesnt.html"><font color="#ffffff">What it
+Cannot Do</font></a>
+</font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font>
+<ul>
 </ul>
-<p><a href="copyright.htm" style="color: rgb(255, 255, 255);"><font
- size="2">Copyright</font> © <font size="2">2001-2004 Thomas M. Eastep.</font></a><br>
-</p>
-<h1 align="center"><b><a href="http://www.sf.net"><img align="left"
- alt="SourceForge Logo"
+<p><font color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><a
+ href="copyright.htm"><font size="2"><font color="#ffffff">Copyright Â©
+2001-2004</font></font></a><font size="2"><br>
+<a href="copyright.htm"><font size="2"><font color="#ffffff">Thomas
+M. Eastep.</font></font></a><font size="2"><br>
+</font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></p>
+<div style="text-align: left;">
+<div style="text-align: left;">
+<h1 align="center"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font =""><b><a
+ href="http://www.sf.net"><img alt="SourceForge Logo"
  src="http://sourceforge.net/sflogo.php?group_id=22587&amp;type=1" title=""
- style="border: 0px solid ; width: 88px; height: 31px;"></a></b></h1>
-<br>
-<small><span style="color: rgb(255, 255, 255);">Please report errors on
-this site
-to </span><a href="mailto:webmaster@shorewall.net"
- style="color: rgb(255, 255, 255);">the Webmaster</a><span
- style="color: rgb(255, 255, 255);">.</span></small><br>
+ style="border: 0px solid ; width: 88px; height: 31px;" align="left"></a></b><br>
+</font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></h1>
+</div>
+</div>
+<p><font color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font color="#ffffff"><font color="#ffffff"><font
+ color="#ffffff"><font size="2">Please report errors&nbsp; on this site
+to <a href="mailto:webmaster@shorewall.net"
+ style="color: rgb(255, 255, 255);">the Webmaster.</a><br>
+<a href="copyright.htm"> </a> </font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></font></p>
 </body>
 </html>
diff --git a/Shorewall-Website/mailing_list.htm b/Shorewall-Website/mailing_list.htm
index 4984a65f6..fd8c22890 100755
--- a/Shorewall-Website/mailing_list.htm
+++ b/Shorewall-Website/mailing_list.htm
@@ -27,14 +27,10 @@ Documentation License</a></span>
 </div>
 </div>
 <div>
-<p class="pubdate">2004-03-15<br>
+<p class="pubdate">2004-09-04<br>
 </p>
-<hr style="width: 100%; height: 2px;"></div>
-<h2>Note</h2>
-<big><span style="color: rgb(255, 0, 0);"><span
- style="font-weight: bold;">If you are reporting a problem or asking a
-question, you are at the wrong place -- please see the <a
- href="http://shorewall.net/support.htm">Shorewall Support Guide</a>.</span></span></big><br>
+<hr style="width: 100%; height: 2px;">
+<p class="pubdate"></p>
 <h2>Mailing Lists are Moderated for Non-Member Posts</h2>
 Given the
 recent problems associated with the MyDoom virus (and the more annoying
@@ -94,12 +90,11 @@ Sort by:
   <option value="revtime">Reverse Time </option>
   <option value="revtitle">Reverse Title </option>
   </select>
-  </font> <input type="hidden" name="config" value="htdig"> <input
- type="hidden" name="restrict"
- value="[http://lists.shorewall.net/pipermail/.*]"> <input
- type="hidden" name="exclude" value=""> <br>
-Search: <input type="text" size="30" name="words" value=""> <input
- type="submit" value="Search"> </p>
+  </font> <input name="config" value="htdig" type="hidden"> <input
+ name="restrict" value="[http://lists.shorewall.net/pipermail/.*]"
+ type="hidden"> <input name="exclude" value="" type="hidden"> <br>
+Search: <input size="30" name="words" value="" type="text"> <input
+ value="Search" type="submit"> </p>
 </form>
 <h2 align="left"><font color="#ff0000">Please do not try to download
 the entire
@@ -122,9 +117,11 @@ users to get answers to questions and to report problems. Information
 of general interest to the Shorewall user community is also posted to
 this list.<br>
 </p>
-<p align="left" style="color: rgb(255, 0, 0);"><big><b>Before posting
-to this list, please see the <a href="http://shorewall.net/support.htm">problem
-reporting guidelines</a>.<br>
+<p style="color: rgb(255, 0, 0);" align="left"><big><b>Problem reports
+that do not include the information requested in the <a
+ href="http://shorewall.net/support.htm">problem
+reporting guidelines</a> will go unanswered (at least by the Shorewall
+author).<br>
 </b></big></p>
 <p align="left">To subscribe: <a
  href="https://lists.shorewall.net/mailman/listinfo/shorewall-users"
@@ -153,9 +150,6 @@ OR ASKING FOR HELP.</span></span></big><br>
  href="https://lists.shorewall.net/mailman/listinfo/shorewall-announce"
  target="_top">https://lists.shorewall.net/mailman/listinfo/shorewall-announce</a>.
 </p>
-<a
- href="https://lists.shorewall.net/mailman/listinfo/shorewall-announce"
- target="_top"></a>
 <ul>
 </ul>
 The list archives are at <a
@@ -250,5 +244,6 @@ Mailman</a></li>
 <h2 align="left">Frustrated by having to Rebuild Mailman to use it with
 Postfix?</h2>
 <p align="left"><a href="gnu_mailman.htm">Check out these instructions</a></p>
+</div>
 </body>
 </html>
diff --git a/Shorewall-Website/shorewall_index.htm b/Shorewall-Website/shorewall_index.htm
index 90d03e67c..a2c7da660 100644
--- a/Shorewall-Website/shorewall_index.htm
+++ b/Shorewall-Website/shorewall_index.htm
@@ -22,9 +22,12 @@ Shorewall. For older versions:<br>
  target="_top">here.</a></li>
   <li>The 1.2 site is <a href="http://shorewall.net/1.2/" target="_top">here</a>.</li>
 </ul>
-Here are the <a
- href="http://shorewall.net/pub/shorewall/2.1/shorewall-2.1.4/releasenotes.txt">release
-notes </a>for the current 2.1 Developement Release<br>
+The current 2.0 Stable Release is 2.0.8 -- Here are the <a
+ href="http://shorewall.net/pub/shorewall/2.0/shorewall-2.0.8/releasenotes.txt">release
+notes</a>.<br>
+The current 2.1 Developement Release is 2.1.8 -- Here are the <a
+ href="http://shorewall.net/pub/shorewall/2.1/shorewall-2.1.8/releasenotes.txt">release
+notes</a>.<br>
 <br>
 Copyright Â© 2001-2004 Thomas M. Eastep<br>
 <div>
@@ -41,7 +44,7 @@ Documentation License</a></span>â€.</p>
 </div>
 </div>
 <div>
-<p class="pubdate">2004-08-10<br>
+<p class="pubdate">2004-08-29<br>
 </p>
 <hr style="width: 100%; height: 2px;"></div>
 <h3>Table of Contents</h3>
@@ -57,7 +60,8 @@ two-interface setup?</a><br>
 </div>
 <a href="#News">News</a><a href="#2_0_7"><br>
 </a>
-<div style="margin-left: 40px;"><a href="#2_0_7">Shorewall 2.0.7</a><br>
+<div style="margin-left: 40px;"><a href="#2_0_8">Shorewall 2.0.8</a><br>
+<a href="#2_0_7">Shorewall 2.0.7</a><br>
 <a href="#2_0_6">Shorewall 2.0.6</a><br>
 <a href="#2_0_5">Shorewall 2.0.5</a><br>
 <a href="#2_0_4">Shorewall 2.0.4</a><br>
@@ -162,6 +166,14 @@ Documentation License"</a>. </div>
 <p> </p>
 <hr style="width: 100%; height: 2px;">
 <h2><a name="News"></a>News</h2>
+<span style="font-weight: bold;"><a name="2_0_8"></a>8/22/2004 -
+Shorewall 2.0.8<br>
+</span><br>
+Problems Corrected:<br>
+<ol>
+  <li>Entries in the USER/GROUP column of an action file (made from
+action.template) may be ignored or cause odd errors.</li>
+</ol>
 <span style="font-weight: bold;"><a name="2_0_7"></a>7/29/2004 -
 Shorewall 2.0.7<br>
 <br>
