diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a1d9315e..51fb9048e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.17.1 / 2020-03-26
+
+* [BUGFIX] TSDB: Fix query performance regression that increased memory and CPU usage #7051
+
 ## 2.17.0 / 2020-03-24
 
 This release implements isolation in TSDB. API queries and recording rules are
diff --git a/VERSION b/VERSION
index d76bd2ba3..3f8eb714d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.17.0
+2.17.1