diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e6338d9375a..327ec19ee66f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.0 (Unreleased)
+
+BUG FIXES:
+ * server: Reject non-TLS clients when TLS enabled [GH-2525]
+
 ## 0.5.6 (March 31, 2017)
 
 IMPROVEMENTS: