diff --git a/CHANGELOG.md b/CHANGELOG.md
index a68f46ce5..c74875035 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.1 / 2017-04-19
+
+* [BUGFIX] Don't panic if storage has no FPs even after initial wait
+
 ## 1.6.0 / 2017-04-14
 
 * [CHANGE] Replaced the remote write implementations for various backends by a
diff --git a/VERSION b/VERSION
index dc1e644a1..9c6d6293b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.0
+1.6.1