diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16a85095ae..093a9ab7e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-## 0.12.31 (Unreleased)
+## 0.12.31 (April 26, 2021)
 
 ENHANCEMENTS:
 
-* cli: Update the HashiCorp public key [GH-28499]
+* cli: Update the HashiCorp public key ([#28499](https://github.com/hashicorp/terraform/issues/28499))
 
 ## 0.12.30 (January 06, 2021)
 
diff --git a/version/version.go b/version/version.go
index 90db759a34..2ff8d52e4e 100644
--- a/version/version.go
+++ b/version/version.go
@@ -16,7 +16,7 @@ var Version = "0.12.31"
 // 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