diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96d1683edb..62a208908d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.6.4 (UNRELEASED)
+## 0.6.4 (March 16, 2016)
 
 BACKWARDS INCOMPATIBILITIES:
 
diff --git a/version.go b/version.go
index 40678a06cc..21c713a0e8 100644
--- a/version.go
+++ b/version.go
@@ -12,4 +12,4 @@ const Version = "0.6.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 = "rc3"
+const VersionPrerelease = ""