diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8132c63b5..81d1f22b85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.6.0 / 2014-06-30
+[FEATURE] Added console and alert templates support, along with various template functions.
+[PERFORMANCE] Much faster and more memory-efficient flushing to disk.
+[ENHANCEMENT] Query results are now only logged when debugging.
+[ENHANCEMENT] Upgraded to new Prometheus client library for exposing metrics.
+[BUGFIX] Samples are now kept in memory until fully flushed to disk.
+[BUGFIX] Non-200 target scrapes are now treated as an error.
+[BUGFIX] Added installation step for missing dependency to Dockerfile.
+[BUGFIX] Removed broken and unused "User Dashboard" link.
+
 ## 0.5.0 / 2014-05-28
 
 * [BUGFIX] Fixed next retrieval time display on status page.
diff --git a/VERSION b/VERSION
index 8f0916f768..a918a2aa18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.0
+0.6.0