diff --git a/pom.xml b/pom.xml
index 3c32a93..3f25797 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,14 +18,10 @@
   <distributionManagement>
     <site>
       <id>velocity.apache.org</id>
-      <url>scp://people.apache.org/www/velocity.apache.org/</url>
+     <url>scpexe://people.apache.org/www/velocity.apache.org/staging</url>
     </site>
   </distributionManagement>
 
-  <build>
-    <defaultGoal>site</defaultGoal>
-  </build>
-
   <licenses>
     <license>
       <name>Apache 2</name>
@@ -154,4 +150,37 @@
       </plugin>
     </plugins>
   </reporting>
+  <build>
+    <defaultGoal>post-site</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-cgi</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>post-site</phase>
+            <configuration>
+              <tasks>
+                <copy todir="${project.reporting.outputDirectory}">
+                  <fileset dir="${basedir}/src/cgi">
+                    <patternset id="cgi.scripts">
+                      <include name="**/*.cgi"/>
+                    </patternset>
+                  </fileset>
+                </copy>
+                <chmod perm="ugo+rx">
+                  <fileset dir="${project.reporting.outputDirectory}">
+                    <patternset refid="cgi.scripts"/>
+                  </fileset>
+                </chmod>
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/src/site/resources/download.cgi b/src/cgi/download.cgi
similarity index 100%
rename from src/site/resources/download.cgi
rename to src/cgi/download.cgi
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index 57812fb..2114c63 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -85,9 +85,9 @@
         </tr>
         <tr>
           <td>Tools</td>
-          <td><a href="[preferred]/velocity/tools/release/velocity-tools-1.2/velocity-tools-src-1.2.zip">velocity-tools-src-1.2.zip</a>
-                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-src-1.2.zip.asc">PGP</a>]
-                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-src-1.2.zip.md5">MD5</a>]
+          <td><a href="[preferred]/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2-src.zip">velocity-tools-1.2-src.zip</a>
+                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2-src.zip.asc">PGP</a>]
+                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2-src.zip.md5">MD5</a>]
           </td>
           <td><a href="[preferred]/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2.zip">velocity-tools-1.2.zip</a>
                           [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2.zip.asc">PGP</a>]
@@ -96,9 +96,9 @@
         </tr>
         <tr>
           <td/>
-          <td><a href="[preferred]/velocity/tools/release/velocity-tools-1.2/velocity-tools-src-1.2.tar.gz">velocity-tools-src-1.2.tar.gz</a>
-                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-src-1.2.tar.gz.asc">PGP</a>]
-                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-src-1.2.tar.gz.md5">MD5</a>]
+          <td><a href="[preferred]/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2-src.tar.gz">velocity-tools-1.2-src.tar.gz</a>
+                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2-src.tar.gz.asc">PGP</a>]
+                          [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2-src.tar.gz.md5">MD5</a>]
           </td>
           <td><a href="[preferred]/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2.tar.gz">velocity-tools-1.2.tar.gz</a>
                           [<a href="http://www.apache.org/velocity/tools/release/velocity-tools-1.2/velocity-tools-1.2.tar.gz.asc">PGP</a>]