diff --git a/core/pom.xml b/core/pom.xml
index 36be257cd..357e012d2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,7 +15,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.0/struts-core</url>
+            <url>scp://people.apache.org/www/struts.apache.org/2.x/struts-core</url>
         </site>
     </distributionManagement>
     
@@ -288,10 +288,10 @@
             <version>1.1</version>
             <scope>test</scope>
             <exclusions>
-            	<exclusion>
-            		<groupId>easymock</groupId>
-            		<artifactId>easymock</artifactId>
-            	</exclusion>
+                <exclusion>
+                    <groupId>easymock</groupId>
+                    <artifactId>easymock</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
       <dependency>
diff --git a/extras/pom.xml b/extras/pom.xml
index c9367a06c..584fc972a 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -15,7 +15,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.0/struts-extras</url>
+            <url>scp://people.apache.org/www/struts.apache.org/2.x/struts-extras</url>
         </site>
     </distributionManagement>
     
diff --git a/pom.xml b/pom.xml
index 0b0a8df19..b26693f7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         </repository>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.0/</url>
+            <url>scp://people.apache.org/www/struts.apache.org/2.x/</url>
         </site>
     </distributionManagement>
 
@@ -217,7 +217,7 @@
     <dependencies/>
 
     <repositories>
-     	<repository>
+        <repository>
             <id>snapshots-maven-codehaus</id>
             <name>snapshots-maven-codehaus</name>
             <snapshots>
diff --git a/src/site/site.xml b/src/site/site.xml
index ef46db0ee..eae15ea86 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -14,7 +14,7 @@
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
             <item name="Struts 1" href="http://struts.apache.org/1.x" />
-            <item name="Struts 2" href="http://struts.apache.org/2.0" />
+            <item name="Struts 2" href="http://struts.apache.org/2.x" />
         </links>
         <menu name="Struts 2">
             <item