diff --git a/pom.xml b/pom.xml
index 887e8f8..d2247e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>tiles-master</artifactId>
         <groupId>org.apache.tiles</groupId>
-        <version>4</version>
+        <version>6</version>
         <relativePath />
     </parent>
     <groupId>org.apache.tiles</groupId>
@@ -56,7 +56,7 @@
     <distributionManagement>
         <site>
             <id>apache-site</id>
-            <url>scp://people.apache.org/www/tiles.apache.org/tiles-autotag</url>
+            <url>scm:svn:https://svn.apache.org/repos/asf/tiles/site/staging/tiles-autotag</url>
         </site>
     </distributionManagement>
     <dependencyManagement>
@@ -103,11 +103,11 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-scm-publish-plugin</artifactId>
+              <extensions>true</extensions>
                 <configuration>
-                    <releaseProfiles>apache-release</releaseProfiles>
-                    <goals>deploy site-deploy</goals>
+                    <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/tiles/site/staging/tiles-autotag</pubScmUrl>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
index b61955f..3106d3b 100644
--- a/src/site/apt/dev/release.apt
+++ b/src/site/apt/dev/release.apt
@@ -25,15 +25,23 @@
 
   Here you will find the steps to create releases for Tiles.
 
+  Apache's existing documentation should be read
+
+  * {{{http://www.apache.org/dev/release-publishing}Publishing Releases}}
+
+  * {{{http://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}
+
+  * {{{http://www.apache.org/dev/release}Releases Policy}}
+
 Prerequisites
 
   To create a release you have to install:
 
-  * {{{http://java.sun.com/javase/6}Java 6.0}}. If you are using a newer
-  version of Java, it is suggested to <<change JAVA_HOME environment variable>>
-  when calling Maven, so it points to an instance of Java 6.0;
+  * {{{http://www.oracle.com/technetwork/java/javase/overview/index.html}Java 7}}. If you are using a newer
+  version of Java <<change JAVA_HOME environment variable>>
+  when calling Maven, so it points to an instance of Java 7;
 
-  * {{{http://maven.apache.org/}Maven 2.2 or 3}};
+  * {{{http://maven.apache.org/}Maven 3.0.5+}};
 
   * {{{http://www.gnupg.org/}GnuPG}};
 
@@ -84,43 +92,7 @@
 
   Your <<<settings.xml>>> must be modified to allow deployment.
 
-  This is the minimal configuration, obviously if you already have a <<<settings.xml>>> file,
-  you must edit it:
-
----------------------------
-<settings xmlns="http://maven.apache.org/POM/4.0.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>apache-site</id>
-            <username>YOUR_APACHE_USERNAME</username>
-            <filePermissions>664</filePermissions>
-            <directoryPermissions>775</directoryPermissions>
-        </server>
-        <server>
-            <id>apache.snapshots.https</id>
-            <username>YOUR_APACHE_USERNAME</username>
-            <password>YOUR_APACHE_PASSWORD</password>
-        </server>
-        <server>
-            <id>apache.releases.https</id>
-            <username>YOUR_APACHE_USERNAME</username>
-            <password>YOUR_APACHE_PASSWORD</password>
-        </server>
-    </servers>
-    <profiles>
-        <profile>
-            <id>release</id>
-            <properties>
-                <gpg.passphrase>YOUR_SECRET_PHRASE</gpg.passphrase>
-            </properties>
-            </profile>
-        </profile>
-    </profiles>
-</settings>
----------------------------
+  See {{{http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env}Publishing Maven Artifacts – Setup your development environment}}
 
 Repeatable operations
 
@@ -132,13 +104,14 @@
   you are preparing the release and type:
 
 -----------------------------------
+mvn clean
 mvn release:prepare -Dusername=YOUR_SVN_USER -Dpassword=YOUR_SVN_PASSWORD
 -----------------------------------
 
   The plugin interactively will ask you the version to release, the Subversion
   tag to use and the next snapshot version. It is recommended to use the tag:
   <<tiles-autotag-X.X.X>>.
-  
+
   See also {{{http://www.apache.org/dev/publishing-maven-artifacts.html}the recommendations of the ASF}}.
 
 * Perform the Release
@@ -148,17 +121,27 @@
 -----------------------------------
 mvn release:perform
 -----------------------------------
-  
-  It should compile and test everything, build and upload the artifacts and the website for the project. 
+
+  It should compile and test everything, build and upload the artifacts and the website for the project.
+
+  <<Troubleshooting>>: if upload of assemblies fails it can be done manually with
+
+-----------------------------------
+cd target/checkout/assembly/target/assemblies/
+ssh user@people.apache.org mkdir /www/people.apache.org/builds/tiles/autotag/${version}/
+scp * user@people.apache.org:/www/people.apache.org/builds/tiles/autotag/${version}/
+-----------------------------------
 
 * Close the staging repository
 
   Login to {{{https://repository.apache.org} Nexus repository}} using your Apache LDAP credentials.
   Click on "Staging". Then click on "tiles" in the list of repositories.
+
   In the panel below you should see an open repository that is linked to your username and ip.
   Right click on this repository and select "Close".
   This will close the repository from future deployments and make it available for others to view.
   If you are staging multiple releases together, skip this step until you have staged everything.
+
   Enter the name and version of the artifact being released in the "Description" field and then click "Close".
   This will make it easier to identify it later.
 
@@ -175,8 +158,8 @@
 * Verify the uploaded assemblies
 
   * go to the destination directory on people.apache.org (cd /www/people.apache.org/builds/tiles/autotag/${version})
-  
-  * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1). 
+
+  * check the presence of the 3 distributions (bin, doc and src), and their signature files (*.asc, *.md5, *sha1).
 
 * Release the JIRA version
 
@@ -258,28 +241,29 @@
   After a vote is finished, and it has been decided that is
   <<at least of alpha quality>>, there is the need of a post-vote process.
 
-** Promote staged artifacts
+** Promote maven staged artifacts
 
-  Once the release is deemed fit for public consumption it can be transfered to a production repository where it will be available to all users.
+  Once the release is deemed fit for public consumption it can be transfered to a
+  production repository where it will be available to all users.
 
   Login to {{{https://repository.apache.org}Nexus repository}} again.
   Click on "Staging" and then on the repository with id "tiles-staging".
-  Find your closed staging repository, right click on it and choose "Promote".
-  Select the "Releases" repository and click "Promote".
+  Find your closed staging repository, right click on it and choose "Release".
 
   Next click on "Repositories", select the "Releases" repository
   and validate that your artifacts exist as you expect them.
 
-** Move assemblies
+** Publish distribution artifacts
 
-  * Move assemblies to the Apache distribution mirrors:
+  * Move assemblies into the Apache {{{http://www.apache.org/dev/release#when-to-archive}dist}} repository:
 
 -------------------------------------------
-ssh user@people.apache.org
-
-cd /www/people.apache.org/builds/tiles/autotag/${version}
-mkdir /www/www.apache.org/dist/tiles/autotag/v${version}/
-cp * /www/www.apache.org/dist/tiles/autotag/v${version}/
+svn co https://dist.apache.org/repos/dist/release/tiles/autotag tiles-autotag-dist-releases
+mkdir tiles-autotag-dist-releases/v${version}
+cd tiles-autotag-dist-releases/v${version}
+scp user@people.apache.org:/www/people.apache.org/builds/tiles/autotag/${version}/* .
+svn add .
+svn ci
 -------------------------------------------
 
 ** Update the site
@@ -295,8 +279,12 @@
   Build and publish the site:
 
 --------------------------------------
-mvn site
-mvn site:deploy
+mvn clean site site:stage
+mvn scm-publish:publish-scm
+# check staging website at target/scmpublish-checkout/index.html
+cd <tiles-site-checkout>/publish/tiles-autotag/
+svn merge ^/tiles/site/staging/tiles-autotag .
+svn ci
 --------------------------------------
 
 ** Send announcement
@@ -310,7 +298,7 @@
 The Apache Tiles team is pleased to announce the release of Tiles Autotag ${version}
 ${quality}.
 
-Tiles Autotag ${version} is available in a binary and a source distribution.
+Available in binary and source distribution.
 
 http://tiles.apache.org/download.html
 
diff --git a/src/site/xdoc/dev/building.xml b/src/site/xdoc/dev/building.xml
index 97b102e..f5d19b5 100644
--- a/src/site/xdoc/dev/building.xml
+++ b/src/site/xdoc/dev/building.xml
@@ -69,10 +69,10 @@
             <li><p>checkout the site from the source repository:</p>
             <p><source>svn co http://svn.apache.org/repos/asf/tiles/site/</source></p></li>
             <li><p>go into the site directory and type:</p>
-            <p><source>mvn site</source></p></li>
+            <p><source>mvn clean site site:stage</source></p></li>
             </ul>
             <p>You will find the generated distribution under
-            <code>{tiles-site-dir}/target/site</code>.</p>
+            <code>{tiles-site-dir}/target/staging</code>.</p>
           </subsection>
           <subsection name="Building the tiles-autotag website">
             <p>To build a project's website:</p>
@@ -81,7 +81,7 @@
             distribution, or checkout the latest version:</p>
             <p><source>svn co http://svn.apache.org/repos/asf/tiles/framework/trunk/tiles-autotag</source></p></li>
             <li><p>go into the source directory and type:</p>
-            <p><source>mvn site site:stage</source></p></li>
+            <p><source>mvn clean site site:stage</source></p></li>
             </ul>
             <p>You will find the generated website under:</p>
             <ul>