diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 20ee5e56ed..3965573235 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Removed Fancy Indexing as a default option on the WEBrick servlet as it made it harder to use various caching schemes
+
+
 *0.9.3* (January 4th, 2005)
 
 * Added support for SQLite in the auto-dumping/importing of schemas for development -> test #416
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index e7cf982ff8..3cb0db0a49 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -21,7 +21,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def initialize(server, options)
     @server_options = options
-    @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root], {:FancyIndexing => true })
+    @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
     super
   end