diff --git a/api/pom.xml b/api/pom.xml
index a080586..fda5d10 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
-        <version>2.0.16-SNAPSHOT</version>
+        <version>2.0.16</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -35,9 +35,9 @@
     <url>http://myfaces.apache.org/core20/myfaces-api</url>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/api</url>
     </scm>
     
     <build>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 96c54c5..2bed853 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -27,14 +27,14 @@
   <parent>
     <groupId>org.apache.myfaces.core</groupId>
     <artifactId>myfaces-core-project</artifactId>
-    <version>2.0.16-SNAPSHOT</version>
+    <version>2.0.16</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/assembly</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/assembly</developerConnection>
-    <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/assembly</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/assembly</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/assembly</developerConnection>
+    <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/assembly</url>
   </scm>
 
   <build>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 722e44b..37d1a8f 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
-        <version>2.0.16-SNAPSHOT</version>
+        <version>2.0.16</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -31,9 +31,9 @@
     <packaging>bundle</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/bundle</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/bundle</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/bundle</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/bundle</url>
     </scm>
     
     <build>
diff --git a/impl/pom.xml b/impl/pom.xml
index c1243db..192d6eb 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
-        <version>2.0.16-SNAPSHOT</version>
+        <version>2.0.16</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -35,9 +35,9 @@
     <url>http://myfaces.apache.org/core20/myfaces-impl</url>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/impl</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/impl</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/impl</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/impl</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/impl</url>
     </scm>
     
     <build>
diff --git a/implee6/pom.xml b/implee6/pom.xml
index 518ec68..67716e7 100644
--- a/implee6/pom.xml
+++ b/implee6/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
-        <version>2.0.16-SNAPSHOT</version>
+        <version>2.0.16</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -36,9 +36,9 @@
     <url>http://myfaces.apache.org/core20/myfaces-implee6</url>
         
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/implee6</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/implee6</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/implee6</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/implee6</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/implee6</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/implee6</url>
     </scm>
 
     <build>
diff --git a/parent/pom.xml b/parent/pom.xml
index 212f66c..ea67e52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -33,7 +33,7 @@
         This project is the home of the MyFaces implementation of the JavaServer Faces 2.0 specification, and
         consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
     </description>
-    <version>2.0.16-SNAPSHOT</version>
+    <version>2.0.16</version>
     <url>http://myfaces.apache.org/core20</url>
     
     <issueManagement>
@@ -42,9 +42,9 @@
     </issueManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/parent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/parent</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/parent</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/parent</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/parent</url>
     </scm>
 
     <build>
diff --git a/pom.xml b/pom.xml
index c3bdebd..cfd363e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
         This project is the home of the MyFaces implementation of the JavaServer Faces 2.0 specification, and
         consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
     </description>
-    <version>2.0.16-SNAPSHOT</version>
+    <version>2.0.16</version>
     <url>http://myfaces.apache.org/core20/module</url>
     
     <issueManagement>
@@ -42,9 +42,9 @@
     </issueManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16</url>
     </scm>
 
     <modules>
diff --git a/shared-public/pom.xml b/shared-public/pom.xml
index 5f1563d..198066b 100644
--- a/shared-public/pom.xml
+++ b/shared-public/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-core-project</artifactId>
-      <version>2.0.16-SNAPSHOT</version>
+      <version>2.0.16</version>
       <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -34,9 +34,9 @@
     needed by the shared-* modules</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared-public</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared-public</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/branches/2.0.x/shared-public</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/shared-public</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/shared-public</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/tags/myfaces-core-module-2.0.16/shared-public</url>
   </scm>
   
   <dependencies>
diff --git a/shared/pom.xml b/shared/pom.xml
index 9fdd77e..85ef464 100644
--- a/shared/pom.xml
+++ b/shared/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-core-project</artifactId>
-      <version>2.0.16-SNAPSHOT</version>
+      <version>2.0.16</version>
       <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -34,9 +34,9 @@
     needed by the shared-* modules</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/branches/2.0.x/shared</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/shared</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.0.16/shared</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/tags/myfaces-core-module-2.0.16/shared</url>
   </scm>
   
   <dependencies>