diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a47b61f7..9d66b8180f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.8.4 (UNRELEASED)
+## 0.8.4 (June 9, 2017)
 
 FEATURES:
 
diff --git a/version/version_base.go b/version/version_base.go
index dbeff52ab0..b23dc076eb 100644
--- a/version/version_base.go
+++ b/version/version_base.go
@@ -12,5 +12,5 @@ func init() {
 	// A pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release
 	// such as "dev" (in development), "beta", "rc1", etc.
-	VersionPrerelease = "dev"
+	VersionPrerelease = ""
 }