diff --git a/CHANGELOG.md b/CHANGELOG.md
index defa0f7f..4e0c963c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.6.12 (unreleased)
+
+  * Fix view_path options for renderer (Thanks @ivanvanderbyl and @route)
+  * Only escape if data exists
+
 ## 0.6.11
 
   * Changes send to __send__ (Thanks @alindeman)