diff --git a/CHANGELOG.md b/CHANGELOG.md
index 458a0915..3881ca39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 ## Unreleased
 
+### Enhancements
+* Add frozen_string_literal magic comment to several files. [@oniofchaos](https://github.com/oniofchaos)
+### Bug fix
+* Fix error when the scope from association has parameter. [@feliperenan](https://github.com/feliperenan)
+* Only call `where` on associations when they respond to it. [@anicholson](https://github.com/anicholson)
+* require 'action_pack' before using it. [@etagwerker](https://github.com/etagwerker)
+* Check if Rails.env is defined. [@etagwerker](https://github.com/etagwerker)
+
 ## 3.5.0
 
 * Updated gem dependency to support Rails 5.1.x.