diff --git a/modules/client/pom.xml b/modules/client/pom.xml
index 1fb2573..037d383 100644
--- a/modules/client/pom.xml
+++ b/modules/client/pom.xml
@@ -106,7 +106,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 3550766..13f2edc 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c847fc0..57f81e7 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -161,7 +161,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/modules/interop/pom.xml b/modules/interop/pom.xml
index 2c96431..d8fef0b 100644
--- a/modules/interop/pom.xml
+++ b/modules/interop/pom.xml
@@ -115,7 +115,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/mar/pom.xml b/modules/mar/pom.xml
index 89ab2d1..c02068e 100644
--- a/modules/mar/pom.xml
+++ b/modules/mar/pom.xml
@@ -107,7 +107,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/persistence/pom.xml b/modules/persistence/pom.xml
index 39b9dac..c7ed9d3 100644
--- a/modules/persistence/pom.xml
+++ b/modules/persistence/pom.xml
@@ -110,7 +110,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/policy/pom.xml b/modules/policy/pom.xml
index 3b83ffc..a119997 100644
--- a/modules/policy/pom.xml
+++ b/modules/policy/pom.xml
@@ -111,7 +111,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml
index a04f030..a79de99 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -73,7 +73,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/resource-bundle/pom.xml b/modules/resource-bundle/pom.xml
index cc0e707..89593f6 100644
--- a/modules/resource-bundle/pom.xml
+++ b/modules/resource-bundle/pom.xml
@@ -68,6 +68,12 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 998def9..805c8d6 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -88,7 +88,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml
index 855ef95..d4f0160 100644
--- a/modules/tests/pom.xml
+++ b/modules/tests/pom.xml
@@ -151,7 +151,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 2f71d83..2707ef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,16 @@
                         <goals>
                             <goal>aggregate</goal>
                         </goals>
+                        <configuration>
+                            <breakiterator>true</breakiterator>
+                            <!-- The notimestamp, windowtitle and bottom parameters are chosen to minimize the number
+                                 of changes between releases (to avoid mass changes when committing the site for a new release) -->
+                            <notimestamp>true</notimestamp>
+                            <windowtitle>Apache Sandesha2</windowtitle>
+                            <bottom>Copyright &#169; {organizationName}. All Rights Reserved.</bottom>
+                            <!-- doctitle only appears in the summary and we should include the version there -->
+                            <doctitle>Apache Sandesha2 ${project.version}</doctitle>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -195,6 +205,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <!-- Required by maven-scm-publish-plugin -->
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-2</version>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -281,6 +305,13 @@
         <url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk</url>
     </scm>
 
+    <distributionManagement>
+        <site>
+            <id>site</id>
+            <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/sandesha</url>
+        </site>
+    </distributionManagement>
+    
     <pluginRepositories>
         <pluginRepository>
             <id>apache.snapshots</id>
diff --git a/src/site/site.xml b/src/site/site.xml
index 9688d95..ddf7802 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -34,16 +34,16 @@
         </links>
         <menu name="Apache Sandesha2">
             <item name="Home" href="index.html" />
-            <item name="Downloads">
+            <item name="Downloads" href="javascript:void(0)">
                 <item name="Releases" href="download.cgi"/>
                 <item name="Source Code" href="http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk"/>
             </item>
-		<item name="Documentation">
+		<item name="Documentation" href="javascript:void(0)">
 			<item name="User Guide" href="userGuide.html"/>
  			<item name="Architecture Guide" href="architectureGuide.html"/>
   			<item name="Java Docs" href="apidocs/index.html" />
             </item>
-            <item name="Project Information">
+            <item name="Project Information" href="javascript:void(0)">
                 <item name="Mailing Lists" href="mail-lists.html"/>
                 <item name="Project Team" href="team-list.html"/>
                 <item name="Issue Tracking" href="issue-tracking.html"/>