diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08dcf8417..014fd48ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,21 @@
-## 2.1.0 / 2018-1-19
+## 2.2.0-rc.0 / 2018-02-13
+
+* [CHANGE] Rename file SD mtime metric.
+* [ENHANCEMENT] Federation performance improvement.
+* [ENHANCEMENT] Read bearer token file on every scrape.
+* [ENHANCEMENT] Improve typeahead on `/graph` page.
+* [ENHANCEMENT] Change rule file formatting.
+* [ENHANCEMENT] Set consul server default to `localhost:8500`.
+* [BUGFIX] Drop metric name for bool modifier.
+* [BUGFIX] Fix races in discovery.
+* [BUGFIX] Fix Kubernetes endpoints SD for empty subsets.
+* [BUGFIX] Throttle updates from SD providers, which caused increased CPU usage and allocations.
+* [BUGFIX] Fix TSDB block reload issue.
+* [BUGFIX] Fix PromQL printing of empty `without()`.
+* [BUGFIX] Don't reset FiredAt for inactive alerts.
+* [BUGFIX] Fix erroneous file version changes and repair existing data.
+
+## 2.1.0 / 2018-01-19
 
 * [FEATURE] New Service Discovery UI showing labels before and after relabelling.
 * [FEATURE] New Admin APIs added to v1 to delete, snapshot and remove tombstones.
diff --git a/VERSION b/VERSION
index 7ec1d6db4..f7757a264 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.0
+2.2.0-rc.0