diff --git a/assemble/pom.xml b/assemble/pom.xml
index f29e4d7..9f33c21 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-mime4j-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index f31082a..76b54f4 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-mime4j-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
index 732b161..ac42dd6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-mime4j-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dom/pom.xml b/dom/pom.xml
index 866fce8..5f65451 100644
--- a/dom/pom.xml
+++ b/dom/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-mime4j-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 58afee8..1cafe31 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-mime4j-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/james-utils/pom.xml b/james-utils/pom.xml
index a03de92..79b7540 100644
--- a/james-utils/pom.xml
+++ b/james-utils/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mime4j-project</artifactId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mbox/pom.xml b/mbox/pom.xml
index 8351b7b..f89af5e 100644
--- a/mbox/pom.xml
+++ b/mbox/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mime4j-project</artifactId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 87f2322..220fa14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>org.apache.james</groupId>
     <artifactId>apache-mime4j-project</artifactId>
-    <version>0.8.5-SNAPSHOT</version>
+    <version>0.8.5</version>
     <packaging>pom</packaging>
 
     <name>Apache James :: Mime4j :: Project</name>
@@ -52,7 +52,7 @@
         <connection>scm:git:http://git-wip-us.apache.org/repos/asf/james-mime4j.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/james-mime4j.git</developerConnection>
         <url>https://git-wip-us.apache.org/repos/asf/james-mime4j.git</url>
-      <tag>HEAD</tag>
+      <tag>apache-mime4j-project-0.8.5</tag>
   </scm>
     <issueManagement>
         <url>http://issues.apache.org/jira/browse/MIME4J</url>
diff --git a/storage/pom.xml b/storage/pom.xml
index 88a7ff9..ae6fb73 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>apache-mime4j-project</artifactId>
         <groupId>org.apache.james</groupId>
-        <version>0.8.5-SNAPSHOT</version>
+        <version>0.8.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>