diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 432e90199a43f24fc0c08c05d8e182d9d9f94d8d..8df943139e353f200e1d86628f415354090d8be1 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Templates without a handler extension now raises a deprecation warning but still
+    defaults to ERb. In future releases, it will simply return the template contents. *Steve Klabnik*
+
 *   Remove `:disable_with` in favor of `'data-disable-with'` option from `submit_tag`, `button_tag` and `button_to` helpers.
 
     *Carlos Galdino + Rafael Mendonça França*