diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index e7627df784..519e76f553 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,12 @@
+*   Add support for tracing constant autoloads. Just throw
+
+        ActiveSupport::Dependencies.logger = Rails.logger
+        ActiveSupport::Dependencies.verbose = true
+
+    in an initializer.
+
+    *Xavier Noria*
+
 *   Maintain `html_safe?` on html_safe strings when sliced.
 
         string = "<div>test</div>".html_safe
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index 0307e06fd9..516b643cb8 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   New section _Troubleshooting_ in the _Autoloading and Reloading Constants_ guide.
+
+    *Xavier Noria*
+
 *   Rails 6 requires Ruby 2.4.1 or newer.
 
     *Jeremy Daer*