diff --git a/pom.xml b/pom.xml
index 43359f8a2..d61e47a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/struts/content/release/2.3.x/</url>
+            <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/struts/content/development/2.x/</url>
         </site>
     </distributionManagement>
 
diff --git a/src/site/site.xml b/src/site/site.xml
index 67096fd91..b6e51d59a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -30,20 +30,20 @@
     <bannerRight>
         <name>Apache Struts</name>
         <src>images/struts2.png</src>
-        <href>http://struts.apache.org/2.x/index.html</href>
+        <href>2.x/index.html</href>
     </bannerRight>
     <body>
         <links>
             <item name="Apache"
                   href="http://www.apache.org/"/>
             <item name="Struts"
-                  href="http://struts.apache.org/index.html"/>
+                  href="/"/>
         </links>
         <menu name="Struts 2">
             <item name="Welcome"
                   href="index.html"/>
             <item name="Releases"
-                  href="http://struts.apache.org/downloads.html"/>
+                  href="downloads.html"/>
             <item name="Thanks!"
                   href="http://apache.org/foundation/thanks.html"/>
             <item name="Sponsorship"
@@ -65,7 +65,7 @@
 
         <menu name="Support">
             <item name="User Mailing List"
-                  href="http://struts.apache.org/mail.html"/>
+                  href="mail.html"/>
             <item name="Issue Tracker (JIRA)"
                   href="https://issues.apache.org/jira/browse/WW"/>
             <item name="Wiki Pages"
@@ -134,21 +134,21 @@
 
         <menu name="Development">
             <item name="Struts 2.x Draft Docs"
-                  href="http://struts.apache.org/2.x/index.html"/>
+                  href="index.html"/>
             <item name="How to Help FAQ"
-                  href="http://struts.apache.org/helping.html"/>
+                  href="helping.html"/>
             <item name="Development Lists"
-                  href="http://struts.apache.org/dev/dev-mail.html"/>
+                  href="dev/dev-mail.html"/>
             <item name="Source Code"
-                  href="http://struts.apache.org/dev/builds.html"/>
+                  href="dev/builds.html"/>
             <item name="Release Guidelines"
-                  href="http://struts.apache.org/dev/releases.html"/>
+                  href="dev/releases.html"/>
             <item name="Volunteers"
-                  href="http://struts.apache.org/dev/volunteers.html"/>
+                  href="dev/volunteers.html"/>
             <item name="PMC Charter"
-                  href="http://struts.apache.org/dev/bylaws.html"/>
+                  href="dev/bylaws.html"/>
             <item name="Sandbox"
-                  href="http://struts.apache.org/struts-sandbox/index.html"/>
+                  href="struts-sandbox/index.html"/>
             <item name="Source Repository"
                   href="http://svn.apache.org/viewcvs.cgi/struts/"/>
         </menu>
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
index c9312e8e5..e56fa5ec7 100644
--- a/src/site/xdoc/index.xml.vm
+++ b/src/site/xdoc/index.xml.vm
@@ -183,7 +183,7 @@
             <subsection>
             <p>
             To download the framework, visit
-            <a href="http://struts.apache.org/download.cgi#struts210">
+            <a href="http://struts.apache.org/download.cgi#struts${aname}">
                Apache Struts Distributions.
             </a>
             For more about Apache Struts 2, visit
