diff --git a/CHANGELOG.md b/CHANGELOG.md
index c046d3364cc..384b1220dbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 2.1.0 (unreleased - master branch)
+# 2.1.0 (2015-08-04)
 
 **Data sources**
 - [Issue #1525](https://github.com/grafana/grafana/issues/1525). InfluxDB: Full support for InfluxDB 0.9 with new adapted query editor
diff --git a/latest.json b/latest.json
index a85d79df539..44755fd4d5c 100644
--- a/latest.json
+++ b/latest.json
@@ -1,3 +1,3 @@
 {
-	"version": "2.0.2"
+	"version": "2.1.0"
 }
diff --git a/package.json b/package.json
index 4200da6951a..f762193b43d 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.1.0-pre1",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"