diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c3190842d..e2c7a09c4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ FIXES
 
 ## 0.18.0
 
-_2018-06-05_
+*June 9, 2018*
 
 BREAKING CHANGES
 
diff --git a/version/version.go b/version/version.go
index 116f1ff287..20074c7bcd 100644
--- a/version/version.go
+++ b/version/version.go
@@ -9,7 +9,7 @@ const Maj = "0"
 const Min = "18"
 const Fix = "0"
 
-const Version = "0.18.0-dev"
+const Version = "0.18.0"
 
 // GitCommit set by build flags
 var GitCommit = ""