diff --git a/Shorewall-Website/News.htm b/Shorewall-Website/News.htm
index e4d6cacd0..d863dbf05 100644
--- a/Shorewall-Website/News.htm
+++ b/Shorewall-Website/News.htm
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <meta name="generator"
- content="HTML Tidy for Linux (vers 1st April 2002), see www.w3.org">
+
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="revised" content="$Id$" />
+
   <title>Shorewall News</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="Generator" content="Kate, the KDE Advanced Text Editor">
+
 </head>
 <body>
 <h1 style="text-align: left;">Shorewall News and Announcements<br>
@@ -24,11 +24,25 @@ Documentation License</a></span>”.<br>
 </p>
 <hr style="width: 100%; height: 2px;">
 <p></p>
-<!-- Shorewall Release 3.0.3 -->
+
+<!-- Shorewall moving to Subversion -->
+
+<span style="font-weight: bold;">2006-02-22 Shorewall moved  to Subversion <br/> </span>
+
+<pre> Effectively today, Shorewall source code repository was migrated to Subversion SCM.
+
+Please read <a href="https://sourceforge.net/svn/?group_id=22587">https://sourceforge.net/svn/?group_id=22587 </a>
+for more information.
+</pre> 
+
+<!-- Moving to Subversion ENDS -->
+
+
+<!-- Shorewall Release 3.0.5 -->
+
 <span style="font-weight: bold;">2006-02-10 Shorewall 3.0.5<br>
 </span>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="Generator" content="Kate, the KDE Advanced Text Editor">
+
 <pre>Problems corrected in Shorewall 3.0.5
 
 1)  Previously, if /etc/shorewall/ipsets existed, it was run when Shorewall starts
diff --git a/Shorewall-Website/Shorewall_sfindex_frame.htm b/Shorewall-Website/Shorewall_sfindex_frame.htm
index 53f1867f0..aa852d84f 100644
--- a/Shorewall-Website/Shorewall_sfindex_frame.htm
+++ b/Shorewall-Website/Shorewall_sfindex_frame.htm
@@ -21,7 +21,7 @@ Announcements</a></li>
   <li><a href="Documentation_Index.html">Documentation</a></li>
   <li><a href="shorewall_mirrors.htm">Mirrors</a></li>
   <li><a href="http://sourceforge.net/cvs/?group_id=22587"
- target="_blank">CVS&nbsp;Repository</a></li>
+ target="_blank">SVN&nbsp;Repository</a></li>
   <li><a href="useful_links.html">Other Links</a></li>
 </ul>
 <ul class="submenu">
diff --git a/Shorewall-Website/download.htm b/Shorewall-Website/download.htm
index 764af5d34..9c9d007f4 100644
--- a/Shorewall-Website/download.htm
+++ b/Shorewall-Website/download.htm
@@ -30,7 +30,7 @@ Documentation License</a></span>”.<br>
 <p><b><a href="#Which">Package Information</a><br>
 <a href="#Updates">Finding Updates that Correct Known Problems</a><br>
 <a href="#Sites">Download Sites</a><br>
-<a href="#CVS">CVS</a><br>
+<a href="#SVN">SVN</a><br>
 </b></p>
 <hr style="width: 100%; height: 2px;">
 <h2><a name="Which"></a>Package Information</h2>
@@ -373,16 +373,16 @@ the integrity of the files</span> using our public key <a
     </tbody>
   </table>
 </blockquote>
-<h2><b><a name="CVS"></a>CVS</b></h2>
-<blockquote>The <a href="http://sourceforge.net/cvs/?group_id=22587"
- target="_blank">CVS&nbsp;Repository at Sourceforge</a> is used as a
+<h2><b><a name="SVN"></a>SVN</b></h2>
+<blockquote>The <a href="https://sourceforge.net/svn/?group_id=22587"
+ target="_blank">SVN&nbsp;Repository at Sourceforge</a> is used as a
 safe-store for Shorewall releases.<br>
   <br>
-You should download and use the latest CVS version only at your own
+You should download and use the latest SVN version only at your own
 risk -- If you are looking for bug fixes for the current release, see <a
  href="#Updates">above.</a><br>
   <br>
-The following CVS projects are currently active:<br>
+The following SVN projects are currently active:<br>
   <ol>
     <li><span style="font-weight: bold;">Shorewall<br>
       <br>
diff --git a/Shorewall/init.archlinux.sh b/Shorewall/init.archlinux.sh
old mode 100644
new mode 100755
diff --git a/Shorewall/init.sh b/Shorewall/init.sh
old mode 100644
new mode 100755
diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 32ca72a2a..e2db475fa 100644
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -229,13 +229,13 @@ case $VERSION in
 	LRPPROJ=Lrp2
 	;;
     2.4.*)
-        CVSTAG=SHOREWALL-2_4
-	DOCTAG=SHOREWALL_2_4
+    CVSTAG="branches/SHOREWALL-2_4/Shorewall"
+	DOCTAG="branches/SHOREWALL_2_4/Shorewall-docs2"
 	XMLPROJ=Shorewall-docs2
 	BUILDLRP=
 	;;
     *ex)
-        CVSTAG=EXPERIMENTAL
+    CVSTAG=EXPERIMENTAL
 	DOCTAG=HEAD
 	XMLPROJ=Shorewall-docs2
 	BUILDLRP=
@@ -305,6 +305,8 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 
     do_or_die "cvs -z3 export -r $CVSTAG -d $SHOREWALLDIR Shorewall >> $LOGFILE 2>&1"
 
+	do_or_die "svn export --non-interactive https://svn.sourceforge.net/svnroot/shorewall/$CVSTAG  $SHOREWALLDIR >> $LOGFILE 2>&1"
+
     fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1     || fatal_error "install.sh has wrong version"
     fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "uninstall.sh has wrong version"
     fgrep VERSION=$VERSION $SHOREWALLDIR/fallback.sh > /dev/null 2>&1    || fatal_error "fallback.sh has wrong version"
