diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12362f1cb..1ec167c10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Next Version (unreleased)
+## 1.8.4 (June 13, 2016)
 
 BUG FIXES:
 
diff --git a/version.txt b/version.txt
index 3df238e22..bfa363e76 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.8.4.dev
+1.8.4