diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdbbb541b9ac3597654d72bde4be5233cde3ed62..83abdb3dc6fa4cd18893e6af243b26559a491a5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.20.0 / 2016-06-15
+
+This release contains multiple breaking changes to the configuration schema.
+
+* [FEATURE] Allow configuring multiple Alertmanagers
+* [FEATURE] Add server name to TLS configuration
+* [FEATURE] Add labels for all node addresses and discover node port if available in Kubernetes SD
+* [ENHANCEMENT] More meaningful configuration errors
+* [ENHANCEMENT] Round scraping timestamps to milliseconds in web UI
+* [ENHANCEMENT] Make number of storage fingerprint locks configurable
+* [BUGFIX] Fix date parsing in console template graphs
+* [BUGFIX] Fix static console files in Docker images
+* [BUGFIX] Fix console JS XHR requests for IE11
+* [BUGFIX] Add missing path prefix in new status page
+* [CHANGE] Rename `target_groups` to `static_configs` in config files
+* [CHANGE] Rename `names` to `files` in file SD configuration
+* [CHANGE] Remove kubelet port config option in Kubernetes SD configuration
+
 ## 0.19.3 / 2016-06-14
 
 * [BUGFIX] Handle Marathon apps with zero ports
diff --git a/VERSION b/VERSION
index b72b05ede10c63153b4e00b9903708bbe4f65485..5a03fb737b381f0b07b830ba4bb6e87342a7a914 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.19.3
+0.20.0