diff --git a/CHANGES.txt b/CHANGES.txt
index b883500..0417fac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,7 @@
 Apache Tez Change Log
 =====================
 
-Release 0.8.5: Unreleased
-
-INCOMPATIBLE CHANGES
-
-ALL CHANGES:
-
-
-Release 0.8.4: In progress.
+Release 0.8.4: 2016-07-08
 
 INCOMPATIBLE CHANGES
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 04b382a..2a13da7 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.5-SNAPSHOT</version>
+      <version>0.8.4</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 f8dae0d..2f461d4 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 a232656..977e7ea 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 de604e0..9898df2 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 fd43eea..0d56a16 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>hadoop-shim-impls</artifactId>
   <packaging>pom</packaging>
diff --git a/hadoop-shim/pom.xml b/hadoop-shim/pom.xml
index 2bad162..ef9dd07 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.5-SNAPSHOT</version>
+     <version>0.8.4</version>
   </parent>
   <artifactId>hadoop-shim</artifactId>
 
diff --git a/pom.xml b/pom.xml
index a0164e8..58554ea 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.5-SNAPSHOT</version>
+  <version>0.8.4</version>
   <name>tez</name>
 
   <licenses>
diff --git a/tez-api/pom.xml b/tez-api/pom.xml
index 316c168..da25446 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-api</artifactId>
 
diff --git a/tez-common/pom.xml b/tez-common/pom.xml
index 5950ec0..c88d078 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-common</artifactId>
 
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index ceed744..acbe007 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <properties>
     <tez.component>tez-dag</tez.component>
diff --git a/tez-dist/pom.xml b/tez-dist/pom.xml
index fcdd216..8096c36 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-dist</artifactId>
 
diff --git a/tez-examples/pom.xml b/tez-examples/pom.xml
index 7c99c2b..1de9122 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
 
   <artifactId>tez-examples</artifactId>
diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
index 105954b..5004bfc 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
 
   <artifactId>tez-ext-service-tests</artifactId>
diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml
index c66649b..1e63127 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-mapreduce</artifactId>
 
diff --git a/tez-plugins/pom.xml b/tez-plugins/pom.xml
index f119783..3c9893e 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 369b8cd..1cbb328 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 35a946a..3a89a5f 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 eab3c28..813396e 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 9aac0e3..82e013f 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 fc49b44..1d0d411 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-yarn-timeline-history</artifactId>
 
diff --git a/tez-runtime-internals/pom.xml b/tez-runtime-internals/pom.xml
index 755e32e..b7f4b15 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-runtime-internals</artifactId>
 
diff --git a/tez-runtime-library/pom.xml b/tez-runtime-library/pom.xml
index 65d86e4..5448a06 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-runtime-library</artifactId>
 
diff --git a/tez-tests/pom.xml b/tez-tests/pom.xml
index c128b93..531bd04 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 d3e9622..f315504 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-job-analyzer</artifactId>
 
diff --git a/tez-tools/analyzers/pom.xml b/tez-tools/analyzers/pom.xml
index 791f009..ef41904 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-perf-analyzer</artifactId>
   <packaging>pom</packaging>
diff --git a/tez-tools/pom.xml b/tez-tools/pom.xml
index 52a744b..43aedc7 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 c14bd69..2f92b00 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.5-SNAPSHOT</version>
+    <version>0.8.4</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 53b014b..62b3598 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-tfile-parser</artifactId>
 
diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml
index 1ba6438..ba73db8 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-ui</artifactId>
   <packaging>war</packaging>
diff --git a/tez-ui2/pom.xml b/tez-ui2/pom.xml
index 9817f75..6651f5f 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.5-SNAPSHOT</version>
+    <version>0.8.4</version>
   </parent>
   <artifactId>tez-ui2</artifactId>
   <packaging>war</packaging>