diff --git a/pom.xml b/pom.xml
index cd35d48bc34..0ae01dbad01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,9 +65,9 @@
 
   <distributionManagement>
     <repository>
-      <id>codehaus-releases</id>
+      <id>codehaus-nexus-staging</id>
       <name>Codehaus Release Repository</name>
-      <url>dav:https://dav.codehaus.org/repository/sonar</url>
+      <url>https://nexus.codehaus.org/service/local/staging/deploy/maven2/</url>
     </repository>
     <snapshotRepository>
       <id>sonar-snapshots</id>
@@ -225,6 +225,11 @@
           <artifactId>maven-plugin-plugin</artifactId>
           <version>2.7</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
@@ -435,6 +440,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+          <localCheckout>true</localCheckout>
+          <pushChanges>false</pushChanges>
+          <mavenExecutorId>forked-path</mavenExecutorId>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>