diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e9e4f33fef..baf12383d65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,7 @@
 - Partial support for url encoded metrics when using Graphite datasource (PR #327) - thx @axe-felix
 - Improvement to InfluxDB query editor and function/value column selection (Issue #473)
 - Initial support for filtering (templated queries) for InfluxDB (PR #375) - thx @mavimo
-- Row editing and adding new panel is now a lot quicker and easier with the new
-  row menu (Issue #475)
+- Row editing and adding new panel is now a lot quicker and easier with the new row menu (Issue #475)
 
 #### Changes
 - Graphite panel is now renamed graph (Existing dashboards will still work)
diff --git a/package.json b/package.json
index 1e2a173ba8b..4e843b3d878 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "1.5.4",
+  "version": "1.6.0-rc.1",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"