diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index ae4d48df0cdae912beb90d4c388dfbab16944f70..11fa6bdc376411f56ff126528b6c9f3472554240 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Remove Dir.chdir in the Webrick DispatchServlet#initialize method.  Fix bad path errors when trying to load config/routes.rb.  [Rick Olson]
+
 * Tighten rescue clauses.  #5985 [james@grayproductions.net]
 
 * Cleaning up tests. [Kevin Clark, Jeremy Kemper]
diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb
index 533cf8c34b6b36a7dee5ffc7d8df531b053a3f9b..b3e28e812b98146545e4bc480dc99d37a12896de 100644
--- a/railties/lib/webrick_server.rb
+++ b/railties/lib/webrick_server.rb
@@ -66,7 +66,6 @@ def self.dispatch(options = {})
   def initialize(server, options) #:nodoc:
     @server_options = options
     @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
-    Dir.chdir("#{RAILS_ROOT}/public") if defined?(RAILS_ROOT) && File.directory?("#{RAILS_ROOT}/public")
     super
   end