diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43c9a7474..3a6defff7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.8.4 (Unreleased)
+## 0.8.4 (January 11, 2017)
 
 BACKWARDS INCOMPATIBILITIES / NOTES:
 
diff --git a/terraform/version.go b/terraform/version.go
index 8e4f2ed1f..1089fa384 100644
--- a/terraform/version.go
+++ b/terraform/version.go
@@ -12,7 +12,7 @@ const Version = "0.8.4"
 // 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.
-const VersionPrerelease = "dev"
+const VersionPrerelease = ""
 
 // SemVersion is an instance of version.Version. This has the secondary
 // benefit of verifying during tests and init time that our version is a
diff --git a/website/config.rb b/website/config.rb
index f7979946a..d86810afc 100644
--- a/website/config.rb
+++ b/website/config.rb
@@ -2,7 +2,7 @@ set :base_url, "https://www.terraform.io/"
 
 activate :hashicorp do |h|
   h.name        = "terraform"
-  h.version     = "0.8.3"
+  h.version     = "0.8.4"
   h.github_slug = "hashicorp/terraform"
 end