diff --git a/CHANGELOG.md b/CHANGELOG.md
index a619e55660..bb423caee2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## UNRELEASED
+## 1.8.5 (October 23, 2020)
 
 SECURITY:
 
diff --git a/version/version.go b/version/version.go
index 3d0bdc4aa9..c29ce0b103 100644
--- a/version/version.go
+++ b/version/version.go
@@ -14,12 +14,12 @@ var (
 	//
 	// Version must conform to the format expected by github.com/hashicorp/go-version
 	// for tests to work.
-	Version = "1.8.4"
+	Version = "1.8.5"
 
 	// 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 = ""
 )
 
 // GetHumanVersion composes the parts of the version in a way that's suitable
diff --git a/website/data/version.js b/website/data/version.js
index 354857e1c0..0b6cf2015f 100644
--- a/website/data/version.js
+++ b/website/data/version.js
@@ -1 +1 @@
-export default '1.8.4'
+export default '1.8.5'