diff --git a/Shorewall-Website/Shorewall_index_frame.htm b/Shorewall-Website/Shorewall_index_frame.htm
index e5086e10e..311237991 100644
--- a/Shorewall-Website/Shorewall_index_frame.htm
+++ b/Shorewall-Website/Shorewall_index_frame.htm
@@ -19,12 +19,7 @@
 <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="font-weight: bold;"><font color="#ffffff">Wiki</font></a><font
- color="#ffffff"><span style="font-weight: bold;">)</span><br>
+<a href="FAQ.htm"><font color="#ffffff"><span style="font-weight: bold;">FAQ</span>s</font></a>
 <a href="troubleshoot.htm"><font color="#ffffff"><span
  style="font-weight: bold;">Troubleshooting</span></font></a><font
  color="#ffffff"><br>
diff --git a/Shorewall-Website/Shorewall_sfindex_frame.htm b/Shorewall-Website/Shorewall_sfindex_frame.htm
index 00632ae45..b3d223c7a 100644
--- a/Shorewall-Website/Shorewall_sfindex_frame.htm
+++ b/Shorewall-Website/Shorewall_sfindex_frame.htm
@@ -19,12 +19,7 @@
 <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="font-weight: bold;"><font color="#ffffff">Wiki</font></a><font
- color="#ffffff"><span style="font-weight: bold;">)</span><br>
+<a href="FAQ.htm"><font color="#ffffff"><span style="font-weight: bold;">FAQ</span>s</font></a><br>
 <a href="troubleshoot.htm"><font color="#ffffff"><span
  style="font-weight: bold;">Troubleshooting</span></font></a><font
  color="#ffffff"><br>
diff --git a/Shorewall-Website/shorewall_index.htm b/Shorewall-Website/shorewall_index.htm
index 700a250e7..d590cf5b1 100644
--- a/Shorewall-Website/shorewall_index.htm
+++ b/Shorewall-Website/shorewall_index.htm
@@ -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.9 -- Here are the <a
  href="http://shorewall.net/pub/shorewall/2.0/shorewall-2.0.9/releasenotes.txt">release
 notes</a>.<br>
-The current 2.1 Developement Release is 2.1.10 -- Here
+The current 2.1 Developement Release is 2.1.11 -- Here
 are the <a
- href="http://shorewall.net/pub/shorewall/2.1/shorewall-2.1.10/releasenotes.txt">release
+ href="http://shorewall.net/pub/shorewall/2.1/shorewall-2.1.11/releasenotes.txt">release
 notes</a>.<br>
 <br>
 Copyright © 2001-2004 Thomas M. Eastep</p>
@@ -46,7 +46,7 @@ entitled “<a
  href="../../../../vfat/Ursa/Shorewall/Shorewall-Website/GnuCopyright.htm"
  target="_self">GNU
 Free Documentation License</a>”.</p>
-<p>2004-10-03</p>
+<p>2004-10-14</p>
 <hr>
 <h3>Table of Contents</h3>
 <p style="margin-left: 0.42in; margin-bottom: 0in;"><a href="#Intro">Introduction