diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a50e607c..dba5a0952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.8.3 (UNRELEASED)
+## 0.8.4 (UNRELEASED)
 
 FEATURES:
 
@@ -10,9 +10,14 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
-* agent: Fixed an issue where NAT-configured agents with a non-routable advertise address would refuse to make RPC connections to Consul servers. This was a regression related to GH-2822 in Consul 0.8.2. [GH-3028]
 * build: Added a vendor fix to allow compilation on Illumos. [GH-3024]
 
+## 0.8.3 (May 12, 2017)
+
+BUG FIXES:
+
+* agent: Fixed an issue where NAT-configured agents with a non-routable advertise address would refuse to make RPC connections to Consul servers. This was a regression related to GH-2822 in Consul 0.8.2. [GH-3028]
+
 ## 0.8.2 (May 9, 2017)
 
 BREAKING CHANGES:
diff --git a/version/version_base.go b/version/version_base.go
index 76cd2b34e..dbeff52ab 100644
--- a/version/version_base.go
+++ b/version/version_base.go
@@ -7,7 +7,7 @@ package version
 // adding new versions and pick a name that will follow "version_base.go".
 func init() {
 	// The main version number that is being run at the moment.
-	Version = "0.8.3"
+	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