diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index f6dc8f238fa06c2e24307cb53c846298f4f7c220..16129e7f2d1823790160b975b9cb5d70db843276 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Update environment.rb comments to include config.autoload_paths. Closes #6478 [caio]
+
 * Update scaffold to use new form_tag block functionality.  Closes #6480. [BobSilva]
 
 * Plugin generator: check for class collisions.  #4833 [vinbarnes@gmail.com]
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 0bc8fda299702aac609c862f0ceb737d4a4aaa4a..71cb1667f4209985088a7e0f18b799fefe4ed4d8 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -19,9 +19,13 @@
   # Only load the plugins named here, by default all plugins in vendor/plugins are loaded
   # config.plugins = %W( exception_notification ssl_requirement )
 
-  # Add additional load paths (these paths will be subject to auto-loading of constants)
+  # Add additional load paths (these are searched when explicitly require something)
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
+  # Add additional autoloading load paths
+  # (these paths will be subject to auto-loading of constants)
+  # config.autoload_paths += Dir["#{RAILS_ROOT}/models/*/"]
+
   # Force all environments to use the same logger level 
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug