diff --git a/CHANGES.txt b/CHANGES.txt
index a2002d6..cbb45a0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,6 @@
 Apache Tez Change Log
 =====================
 
-Release 0.8.6: Unreleased
-
-INCOMPATIBLE CHANGES
-
-ALL CHANGES:
-
-
 Release 0.8.5: 2016-03-13
 
 INCOMPATIBLE CHANGES
diff --git a/docs/pom.xml b/docs/pom.xml
index 70dcca3..93db343 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,7 +27,7 @@
     <parent>
       <groupId>org.apache.tez</groupId>
       <artifactId>tez</artifactId>
-      <version>0.8.6-SNAPSHOT</version>
+      <version>0.8.5</version>
     </parent>
     <artifactId>tez-docs</artifactId>
     <packaging>pom</packaging>
diff --git a/hadoop-shim-impls/hadoop-shim-2.4/pom.xml b/hadoop-shim-impls/hadoop-shim-2.4/pom.xml
index 440f08e..bbb88ff 100644
--- a/hadoop-shim-impls/hadoop-shim-2.4/pom.xml
+++ b/hadoop-shim-impls/hadoop-shim-2.4/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>hadoop-shim-impls</artifactId>
     <groupId>org.apache.tez</groupId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hadoop-shim-2.4</artifactId>
diff --git a/hadoop-shim-impls/hadoop-shim-2.6/pom.xml b/hadoop-shim-impls/hadoop-shim-2.6/pom.xml
index cc357a3..6c63ef5 100644
--- a/hadoop-shim-impls/hadoop-shim-2.6/pom.xml
+++ b/hadoop-shim-impls/hadoop-shim-2.6/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>hadoop-shim-impls</artifactId>
     <groupId>org.apache.tez</groupId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hadoop-shim-2.6</artifactId>
diff --git a/hadoop-shim-impls/hadoop-shim-2.8/pom.xml b/hadoop-shim-impls/hadoop-shim-2.8/pom.xml
index 28782df..50dd000 100644
--- a/hadoop-shim-impls/hadoop-shim-2.8/pom.xml
+++ b/hadoop-shim-impls/hadoop-shim-2.8/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>hadoop-shim-impls</artifactId>
     <groupId>org.apache.tez</groupId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hadoop-shim-2.8</artifactId>
diff --git a/hadoop-shim-impls/pom.xml b/hadoop-shim-impls/pom.xml
index a224043..3364793 100644
--- a/hadoop-shim-impls/pom.xml
+++ b/hadoop-shim-impls/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tez</artifactId>
     <groupId>org.apache.tez</groupId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>hadoop-shim-impls</artifactId>
   <packaging>pom</packaging>
diff --git a/hadoop-shim/pom.xml b/hadoop-shim/pom.xml
index c0c33cc..f975236 100644
--- a/hadoop-shim/pom.xml
+++ b/hadoop-shim/pom.xml
@@ -20,7 +20,7 @@
   <parent>
      <artifactId>tez</artifactId>
      <groupId>org.apache.tez</groupId>
-     <version>0.8.6-SNAPSHOT</version>
+     <version>0.8.5</version>
   </parent>
   <artifactId>hadoop-shim</artifactId>
 
diff --git a/pom.xml b/pom.xml
index 2e2b592..c8d372a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <groupId>org.apache.tez</groupId>
   <artifactId>tez</artifactId>
   <packaging>pom</packaging>
-  <version>0.8.6-SNAPSHOT</version>
+  <version>0.8.5</version>
   <name>tez</name>
 
   <licenses>
diff --git a/tez-api/pom.xml b/tez-api/pom.xml
index 0485898..f758bbd 100644
--- a/tez-api/pom.xml
+++ b/tez-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-api</artifactId>
 
diff --git a/tez-common/pom.xml b/tez-common/pom.xml
index 7b4cc3f..5617021 100644
--- a/tez-common/pom.xml
+++ b/tez-common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-common</artifactId>
 
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index 82a3620..1cc2892 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <properties>
     <tez.component>tez-dag</tez.component>
diff --git a/tez-dist/pom.xml b/tez-dist/pom.xml
index 9619dac..879432b 100644
--- a/tez-dist/pom.xml
+++ b/tez-dist/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-dist</artifactId>
 
diff --git a/tez-examples/pom.xml b/tez-examples/pom.xml
index db6f349..580028c 100644
--- a/tez-examples/pom.xml
+++ b/tez-examples/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
 
   <artifactId>tez-examples</artifactId>
diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
index 6aa504e..ac698d5 100644
--- a/tez-ext-service-tests/pom.xml
+++ b/tez-ext-service-tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tez</artifactId>
     <groupId>org.apache.tez</groupId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
 
   <artifactId>tez-ext-service-tests</artifactId>
diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml
index 62f0614..63cd6f3 100644
--- a/tez-mapreduce/pom.xml
+++ b/tez-mapreduce/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-mapreduce</artifactId>
 
diff --git a/tez-plugins/pom.xml b/tez-plugins/pom.xml
index cd6c10f..73d3d1a 100644
--- a/tez-plugins/pom.xml
+++ b/tez-plugins/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-plugins</artifactId>
   <packaging>pom</packaging>
diff --git a/tez-plugins/tez-history-parser/pom.xml b/tez-plugins/tez-history-parser/pom.xml
index 36f9e48..36ebd94 100644
--- a/tez-plugins/tez-history-parser/pom.xml
+++ b/tez-plugins/tez-history-parser/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-plugins</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-history-parser</artifactId>
 
diff --git a/tez-plugins/tez-yarn-timeline-cache-plugin/pom.xml b/tez-plugins/tez-yarn-timeline-cache-plugin/pom.xml
index 643b42c..87e3bd4 100644
--- a/tez-plugins/tez-yarn-timeline-cache-plugin/pom.xml
+++ b/tez-plugins/tez-yarn-timeline-cache-plugin/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-plugins</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-yarn-timeline-cache-plugin</artifactId>
 
diff --git a/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml b/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
index ffafc49..73ea684 100644
--- a/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
+++ b/tez-plugins/tez-yarn-timeline-history-with-acls/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-plugins</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-yarn-timeline-history-with-acls</artifactId>
 
diff --git a/tez-plugins/tez-yarn-timeline-history-with-fs/pom.xml b/tez-plugins/tez-yarn-timeline-history-with-fs/pom.xml
index de32ce7..025e4c2 100644
--- a/tez-plugins/tez-yarn-timeline-history-with-fs/pom.xml
+++ b/tez-plugins/tez-yarn-timeline-history-with-fs/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-plugins</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-yarn-timeline-history-with-fs</artifactId>
 
diff --git a/tez-plugins/tez-yarn-timeline-history/pom.xml b/tez-plugins/tez-yarn-timeline-history/pom.xml
index 55b3665..5dcc10e 100644
--- a/tez-plugins/tez-yarn-timeline-history/pom.xml
+++ b/tez-plugins/tez-yarn-timeline-history/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-plugins</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-yarn-timeline-history</artifactId>
 
diff --git a/tez-runtime-internals/pom.xml b/tez-runtime-internals/pom.xml
index b993378..56c692b 100644
--- a/tez-runtime-internals/pom.xml
+++ b/tez-runtime-internals/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-runtime-internals</artifactId>
 
diff --git a/tez-runtime-library/pom.xml b/tez-runtime-library/pom.xml
index bc997cd..00d8f94 100644
--- a/tez-runtime-library/pom.xml
+++ b/tez-runtime-library/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-runtime-library</artifactId>
 
diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml
index 05d5459..fb3fb31 100644
--- a/tez-tests/pom.xml
+++ b/tez-tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-tests</artifactId>
 
diff --git a/tez-tools/analyzers/job-analyzer/pom.xml b/tez-tools/analyzers/job-analyzer/pom.xml
index 594eaaf..1b46a17 100644
--- a/tez-tools/analyzers/job-analyzer/pom.xml
+++ b/tez-tools/analyzers/job-analyzer/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-perf-analyzer</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-job-analyzer</artifactId>
 
diff --git a/tez-tools/analyzers/pom.xml b/tez-tools/analyzers/pom.xml
index b617d9c..193f9ff 100644
--- a/tez-tools/analyzers/pom.xml
+++ b/tez-tools/analyzers/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-tools</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-perf-analyzer</artifactId>
   <packaging>pom</packaging>
diff --git a/tez-tools/pom.xml b/tez-tools/pom.xml
index 19eafff..4815a53 100644
--- a/tez-tools/pom.xml
+++ b/tez-tools/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-tools</artifactId>
   <packaging>pom</packaging>
diff --git a/tez-tools/tez-javadoc-tools/pom.xml b/tez-tools/tez-javadoc-tools/pom.xml
index 52b23df..2b0032d 100644
--- a/tez-tools/tez-javadoc-tools/pom.xml
+++ b/tez-tools/tez-javadoc-tools/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-tools</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-javadoc-tools</artifactId>
 
diff --git a/tez-tools/tez-tfile-parser/pom.xml b/tez-tools/tez-tfile-parser/pom.xml
index e5319f7..ad0528a 100644
--- a/tez-tools/tez-tfile-parser/pom.xml
+++ b/tez-tools/tez-tfile-parser/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez-tools</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-tfile-parser</artifactId>
 
diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml
index 293ac4d..70a637a 100644
--- a/tez-ui/pom.xml
+++ b/tez-ui/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-ui</artifactId>
   <packaging>war</packaging>
diff --git a/tez-ui2/pom.xml b/tez-ui2/pom.xml
index 36dd1e5..f1b24cb 100644
--- a/tez-ui2/pom.xml
+++ b/tez-ui2/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.tez</groupId>
     <artifactId>tez</artifactId>
-    <version>0.8.6-SNAPSHOT</version>
+    <version>0.8.5</version>
   </parent>
   <artifactId>tez-ui2</artifactId>
   <packaging>war</packaging>