diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55cd763861..4a2d441685 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,19 @@
-## 0.11.6 (Unreleased)
+## 0.11.6 (April 5, 2018)
 
 BUG FIXES:
 
-* cli: Don't allow -target without arguments [GH-16360]
-* cli: Fix strange formatting of list and map values in the `terraform console` command [GH-17714]
-* core: Don't evaluate unused outputs during a full destroy operation [GH-17768]
-* core: Fix local and output evaluation when they reference a resource being scaled down to 0 [GH-17765]
-* connection/ssh: Retry on authentication failures when the remote service is available before it is completely configured [GH-17744]
-* connection/winrm: Get execution errors from winrm commands [GH-17788]
-* connection/winrm: Support NTLM authentication [GH-17748]
-* provisioner/habitat: Set channel and builder URL during install, and enable service before start [GH-17403] [GH-17781]
+* cli: Don't allow -target without arguments ([#16360](https://github.com/hashicorp/terraform/issues/16360))
+* cli: Fix strange formatting of list and map values in the `terraform console` command ([#17714](https://github.com/hashicorp/terraform/issues/17714))
+* core: Don't evaluate unused outputs during a full destroy operation ([#17768](https://github.com/hashicorp/terraform/issues/17768))
+* core: Fix local and output evaluation when they reference a resource being scaled down to 0 ([#17765](https://github.com/hashicorp/terraform/issues/17765))
+* connection/ssh: Retry on authentication failures when the remote service is available before it is completely configured ([#17744](https://github.com/hashicorp/terraform/issues/17744))
+* connection/winrm: Get execution errors from winrm commands ([#17788](https://github.com/hashicorp/terraform/issues/17788))
+* connection/winrm: Support NTLM authentication ([#17748](https://github.com/hashicorp/terraform/issues/17748))
+* provisioner/habitat: Set channel and builder URL during install, and enable service before start ([#17403](https://github.com/hashicorp/terraform/issues/17403)] [[#17781](https://github.com/hashicorp/terraform/issues/17781))
 
 PROVIDER SDK CHANGES (not user-facing):
 
-* helper/schema: Attribute value is no longer included in error message when `ConflictsWith` keys are used together. [GH-17738]
+* helper/schema: Attribute value is no longer included in error message when `ConflictsWith` keys are used together. ([#17738](https://github.com/hashicorp/terraform/issues/17738))
 
 ## 0.11.5 (March 21, 2018)
 
diff --git a/version/version.go b/version/version.go
index e28e67013e..b7decd1f11 100644
--- a/version/version.go
+++ b/version/version.go
@@ -16,7 +16,7 @@ const Version = "0.11.6"
 // 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.
-var Prerelease = "dev"
+var Prerelease = ""
 
 // SemVer is an instance of version.Version. This has the secondary
 // benefit of verifying during tests and init time that our version is a