diff --git a/Shorewall-Website/shoreline.htm b/Shorewall-Website/shoreline.htm
index c71227153..c9d74adb8 100644
--- a/Shorewall-Website/shoreline.htm
+++ b/Shorewall-Website/shoreline.htm
@@ -27,7 +27,7 @@ Texts. A copy of the license is included in the section entitled “<span
  class="quote"><a href="GnuCopyright.htm" target="_self">GNU Free
 Documentation License</a></span>”.<br>
 </p>
-<p>2004-09-05<br>
+<p>2004-11-18<br>
 </p>
 <hr style="width: 100%; height: 2px;">
 <p style="text-align: left;"><img src="images/Tom.jpg"
@@ -48,9 +48,9 @@ of Washington</a> 1969</li>
   <li>Burroughs Corporation (now <a href="http://www.unisys.com"
  target="_top">Unisys</a>
 ) 1969 - 1980</li>
-  <li><a href="http://www.tandem.com" target="_top">Tandem Computers,
-Incorporated</a>
-(now part of the <a href="http://www.hp.com" target="_top">The New HP</a>)
+  <li>Tandem Computers,
+Incorporated
+(now part of <a href="http://www.hp.com" target="_top">Hewlett-Packard</a>)
 1980 -
 present</li>
   <li>Married 1969 - no children.</li>
diff --git a/Shorewall-Website/shorewall_index.htm b/Shorewall-Website/shorewall_index.htm
index a0f6938e0..d7f4cf895 100644
--- a/Shorewall-Website/shorewall_index.htm
+++ b/Shorewall-Website/shorewall_index.htm
@@ -9,11 +9,11 @@
   <meta name="CHANGED" content="20040920;15183300">
 </head>
 <body dir="ltr" lang="en-US">
-<h1>Shorewall 2.0</h1>
+<h1>Shorewall 2.x</h1>
 <p><b>Tom Eastep</b><br>
 <br>
 The information on this site applies only
-to 2.0.x releases of Shorewall. For older versions:</p>
+to 2.x releases of Shorewall. For older versions:</p>
 <ul>
   <li>
     <p style="margin-bottom: 0in;">The 1.4 site is <a
@@ -31,9 +31,9 @@ to 2.0.x releases of Shorewall. For older versions:</p>
 <p>The current 2.0 Stable Release is 2.0.10 -- Here are the <a
  href="http://shorewall.net/pub/shorewall/2.0/shorewall-2.0.10/releasenotes.txt">release
 notes</a>.<br>
-The current Developement Release is 2.2.0 Beta 2 -- Here
+The current Developement Release is 2.2.0 Beta 4 -- Here
 are the <a
- href="http://shorewall.net/pub/shorewall/2.2-Beta/shorewall-2.2.0-Beta2/releasenotes.txt">release
+ href="http://shorewall.net/pub/shorewall/2.2-Beta/shorewall-2.2.0-Beta4/releasenotes.txt">release
 notes</a>.<br>
 <br>
 Copyright © 2001-2004 Thomas M. Eastep</p>
@@ -44,7 +44,7 @@ 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 “<a href="GnuCopyright.htm" target="_self">GNU
 Free Documentation License</a>”.</p>
-<p>2004-11-02</p>
+<p>2004-11-19</p>
 <hr>
 <h3>Table of Contents</h3>
 <p style="margin-left: 0.42in; margin-bottom: 0in;"><a href="#Intro">Introduction
@@ -60,7 +60,9 @@ Shorewall on Mandrake® with a two-interface setup?</a><br>
 <a href="#License">License</a></p>
 <p style="margin-bottom: 0in; margin-left: 40px;"><a href="#2_0_10">News</a></p>
 <p style="margin-left: 0.83in; margin-bottom: 0in;"><a
- href="#2_2_0_Beta2">Shorewall 2.2.0 Beta 2</a><br>
+ href="#2_2_0_Beta4">Shorewall 2.2.0 Beta 4</a><br>
+<a href="#2_2_0_Beta3">Shorewall 2.2.0 Beta 3</a><br>
+<a href="#2_2_0_Beta2">Shorewall 2.2.0 Beta 2</a><br>
 <a href="#2_0_10">Shorewall
 2.0.10</a><br>
 <a href="#2_2_0_Beta1">Shorewall 2.2.0 Beta 1</a><br>
@@ -155,6 +157,39 @@ of the license is included in the section entitled "GNU Free
 Documentation License". </p>
 <hr>
 <h2><a name="News"></a>News</h2>
+<span style="font-weight: bold;"><a name="2_2_0_Beta4"></a>11/19/2004 -
+Shorewall 2.2.0 Beta 4<br>
+</span><br>
+Problems Corrected:<br>
+<ol>
+  <li>A cut and paste error resulted in some nonsense in the
+description of the IPSEC column in /etc/shorewall/masq.</li>
+  <li>A typo in /etc/shorewall/rules has been corrected.</li>
+  <li>The bogons file has been updated.</li>
+  <li>The "shorewall add" command previously reported success but did
+nothing -- now it works.</li>
+</ol>
+New Features:<br>
+<ol>
+  <li>The AllowNNTP action now allows NNTP over SSL/TLS (NNTPS).<br>
+  </li>
+</ol>
+<span style="font-weight: bold;"><a name="2_2_0_Beta3"></a>11/09/2004 -
+Shorewall 2.2.0 Beta 3<br>
+</span><br>
+Problems Corrected:<br>
+<ol>
+  <li>Missing '#' in the rfc1918 file has been corrected.</li>
+  <li>The INSTALL file now includes special instructions for Slackware
+users.</li>
+</ol>
+New Features:<br>
+<ol>
+  <li>In CLASSIFY rules (/etc/shorewall/tcrules), an interface name may
+now appear in the DEST column as in:<br>
+    <pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #MARK/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; SOURCE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DEST&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PROTO&nbsp;&nbsp;&nbsp;&nbsp; PORT(S)<br>        #CLASSIFY<br>        1:30&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; eth0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; tcp&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 25</pre>
+  </li>
+</ol>
 <span style="font-weight: bold;"><a name="2_2_0_Beta2"></a>11/02/2004 -
 Shorewall 2.2.0 Beta 2<br>
 <br>
diff --git a/Shorewall-Website/shorewall_mirrors.htm b/Shorewall-Website/shorewall_mirrors.htm
index e286bf7c6..fa850992c 100644
--- a/Shorewall-Website/shorewall_mirrors.htm
+++ b/Shorewall-Website/shorewall_mirrors.htm
@@ -20,19 +20,26 @@ Texts. A copy of the license is included in the section entitled “<span
  class="quote"><a href="GnuCopyright.htm" target="_self">GNU Free
 Documentation License</a></span>”.<br>
 </p>
-<p>2004-04-05<br>
+<p>2004-11-14<br>
 </p>
 <hr style="width: 100%; height: 2px;"><span style="font-weight: bold;"><span
  style="font-weight: bold;"></span></span>
 <p align="left"><b>Remember that updates to the mirrors are often
-delayed for 6-12 hours after an update to the primary rsync site. For
-HTML content, the main web site (<a href="http://shorewall.sf.net"
- target="_top">http://shorewall.sf.net</a>)
-is updated at the same time as the rsync site.</b></p>
-<p align="left">The main Shorewall Web Site is <a
- href="http://shorewall.sf.net" target="_top">http://shorewall.sf.net</a>
-and is located in California, USA. It is mirrored at:</p>
+delayed for 6-12 hours after an update to the primary site. For
+HTML content, the Sourceforge web site (<a
+ href="http://shorewall.sf.net" target="_top">http://shorewall.sf.net</a>)
+is updated at the same time as the primary site.<br>
+</b></p>
+<p align="left"><b>The primary site has a very low bandwidth so I
+encourage you to use a mirror site whenever possible.<br>
+</b></p>
+<p align="left">The primary web site is <a href="http://shorewall.net/"
+ target="_top">http://shorewall.net</a>
+(Shoreline, Washington, USA). It is mirrored via rsync at:<br>
+</p>
 <ul>
+  <li><a href="http://www.shorewall.net/" target="_top">http://www.shorewall.net</a>
+(Washington State, USA)</li>
   <li><a target="_top" href="http://slovakia.shorewall.net">http://slovakia.shorewall.net</a>
 (Slovak Republic).</li>
   <li> <a href="http://www.infohiiway.com/shorewall" target="_top">http://shorewall.infohiiway.com</a>
@@ -55,20 +62,20 @@ and is located in California, USA. It is mirrored at:</p>
   <li><a href="http://shorewall.viisage.com" target="_top">http://shorewall.viisage.com</a>
 (Boston Mass., USA)<br>
   </li>
-  <li><a href="http://www.shorewall.net" target="_top">http://www.shorewall.net</a>
-(Washington State, USA)</li>
-  <li><a href="http://shorewall.net" target="_top">http://shorewall.net</a>
-(Shoreline, Washington, USA)<br>
-  </li>
 </ul>
-<p align="left">The rsync site is mirrored via FTP at:</p>
+<p align="left">The primary FTP site is <a
+ href="ftp://shorewall.net/pub/shorewall/" target="_top">ftp://shorewall.net/pub/shorewall/</a>&nbsp;
+(Shoreline, Washington, USA). It is mirrored via rsync at:<br>
+</p>
 <ul>
+  <li><a href="ftp://ftp.shorewall.net/pub/shorewall" target="_blank">ftp://ftp.shorewall.net
+    </a>(Washington State, USA)</li>
   <li><a target="_blank"
  href="ftp://slovakia.shorewall.net/mirror/shorewall/">ftp://slovakia.shorewall.net/mirror/shorewall</a>
 (Slovak Republic).</li>
   <li> <a href="ftp://ftp.infohiiway.com/pub/mirrors/shorewall/"
- target="_blank">ftp://ftp.infohiiway.com/pub/shorewall</a> (Texas, USA
--- temporarily unavailable).</li>
+ target="_blank">ftp://ftp.infohiiway.com/pub/shorewall</a> (Texas,
+USA).</li>
   <li><a target="_blank"
  href="ftp://germany.shorewall.net/pub/shorewall">ftp://germany.shorewall.net/pub/shorewall</a>
 AKA <a href="ftp://www.shorewall.de/pub/shorewall" target="_top">ftp://www.shorewall.de/pub/shorewall</a>
@@ -84,11 +91,6 @@ AKA <a href="ftp://www.shorewall.de/pub/shorewall" target="_top">ftp://www.shore
   <li><a href="ftp://ftp.shorewall.com.au" target="_top">ftp://ftp.shorewall.com.au</a>
 (Australia)<br>
   </li>
-  <li><a href="ftp://ftp.shorewall.net/pub/shorewall" target="_blank">ftp://ftp.shorewall.net
-    </a>(Washington State, USA)</li>
-  <li><a href="ftp://shorewall.net/pub/shorewall/" target="_top">ftp://shorewall.net/pub/shorewall/</a>&nbsp;
-(Shoreline, Washington, USA)<br>
-  </li>
 </ul>
 Search results and the mailing list archives are always fetched from
 the site in Washington State.<br>
