diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71a96c66e4..3e3a054326 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.8.5 (UNRELEASED)
+## 0.8.5 (June 27, 2017)
 
 BREAKING CHANGES:
 
diff --git a/version/version_base.go b/version/version_base.go
index 8fc05db26b..5b93d48723 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 = ""
 }