diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index f1694f9a..14ce47d8 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,10 @@
+== master
+
+* bug fix
+  * Do not use required='required' when browser validations are turned off
+  * Sanitize HMTL attributes in error and hint helpers when options are present
+  * Improve i18n lookup by ignoring explicit child index given to form builder (tests by github.com/rywall)
+
 == 1.4.0
 
 * enhancements