diff --git a/api/pom.xml b/api/pom.xml
index 54b9442..446a970 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.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -35,9 +35,9 @@
     <url>http://myfaces.apache.org/core21/myfaces-api</url>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/api</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/api</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/api</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/api</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/api</url>
     </scm>
     
     <build>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e7e5d75..7b77274 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.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</developerConnection>
-    <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/assembly</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/assembly</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/assembly</developerConnection>
+    <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/assembly</url>
   </scm>
 
   <build>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index f9ae0e1..e56f520 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.1.8-SNAPSHOT</version>
+        <version>2.1.8</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/trunk/bundle</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/bundle</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/bundle</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/bundle</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/bundle</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/bundle</url>
     </scm>
     
     <build>
diff --git a/impl/pom.xml b/impl/pom.xml
index 2d29227..af27bc1 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.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -35,9 +35,9 @@
     <url>http://myfaces.apache.org/core21/myfaces-impl</url>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/impl</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/impl</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/impl</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/impl</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/impl</url>
     </scm>
     
     <build>
diff --git a/implee6/pom.xml b/implee6/pom.xml
index 20763d3..dd7c12f 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.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -36,9 +36,9 @@
     <url>http://myfaces.apache.org/core21/myfaces-implee6</url>
         
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/implee6</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/implee6</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/implee6</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/implee6</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/implee6</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/implee6</url>
     </scm>
 
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 09d0286..5efe4e2 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.1 specification, and
         consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
     </description>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <url>http://myfaces.apache.org/core21</url>
     
     <issueManagement>
@@ -42,9 +42,9 @@
     </issueManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/parent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/parent</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk/parent</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/parent</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/parent</url>
     </scm>
 
     <build>
diff --git a/pom.xml b/pom.xml
index ce93cd1..4ac5576 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.1 specification, and
         consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
     </description>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.1.8</version>
     <url>http://myfaces.apache.org/core21</url>
 
     <issueManagement>
@@ -42,9 +42,9 @@
     </issueManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8</url>
     </scm>
 
     <modules>
diff --git a/shaded-impl/pom.xml b/shaded-impl/pom.xml
index 3c50381..6333246 100644
--- a/shaded-impl/pom.xml
+++ b/shaded-impl/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
-        <version>2.1.8-SNAPSHOT</version>
+        <version>2.1.8</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -35,9 +35,9 @@
     <url>http://myfaces.apache.org/core21/myfaces-shaded-impl</url>
 
     <scm>
-        <connection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/shaded-impl</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/shaded-impl</developerConnection>
-        <url>https://svn.apache.org/repos/asf/myfaces/core/trunk/shaded-impl</url>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shaded-impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shaded-impl</developerConnection>
+        <url>https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shaded-impl</url>
     </scm>
     
     <build>
diff --git a/shared-public/pom.xml b/shared-public/pom.xml
index 393134d..f7ca09a 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.1.8-SNAPSHOT</version>
+      <version>2.1.8</version>
       <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -34,9 +34,9 @@
   projects like Tomahawk, Orchestra and Portlet-Bridge through shared project.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/shared-public</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/shared-public</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/trunk/shared-public</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shared-public</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shared-public</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/tags/myfaces-core-module-2.1.8/shared-public</url>
   </scm>
   
   <dependencies>
diff --git a/shared/pom.xml b/shared/pom.xml
index 1f620b9..ae7c121 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.1.8-SNAPSHOT</version>
+      <version>2.1.8</version>
       <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
@@ -34,9 +34,9 @@
   projects like Tomahawk, Orchestra and Portlet-Bridge through shared project.</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/shared</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/trunk/shared</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/trunk/shared</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shared</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/tags/myfaces-core-module-2.1.8/shared</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/tags/myfaces-core-module-2.1.8/shared</url>
   </scm>
   
   <dependencies>