diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed407d70fef..acbe07795be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 2.0.0 (unreleased)
+# 2.0.0 (2015-04-20)
 
 **Fixes**
 - [Issue #1784](https://github.com/grafana/grafana/issues/1784). Data source proxy: Fixed issue with using data source proxy when grafana is behind nginx suburl
diff --git a/package.json b/package.json
index 28d6df1a9c5..60de3e69266 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.0.0-rc1",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"