diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 1d1806376b..e8c4d9acad 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,12 +1,14 @@
 *CVS*
 
+* Renamed public/dispatch.servlet to script/server -- it wasn't really dispatching anyway as its delegating calls to public/dispatch.rb
+
 * Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible
   for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb
 
 * Added script/envcon that makes it even easier to start an IRB session for interacting with the domain model. Run with no-args to
   see help.
 
-* Added breakpoint support by default to the WEBrick dispatcher. This means that you can break out of execution at any point in
+* Added breakpoint support through the script/breakpointer client. This means that you can break out of execution at any point in
   the code, investigate and change the model, AND then resume execution! Example:
   
     class WeblogController < ActionController::Base
@@ -16,8 +18,8 @@
       end
     end
     
-  So the controller will accept the action, run the first line, then present you with a IRB prompt in the WEBrick window (you shouldn't
-  run as daemon when you want to use this). Here you can do things like:
+  So the controller will accept the action, run the first line, then present you with a IRB prompt in the breakpointer window. 
+  Here you can do things like:
   
   Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
 
diff --git a/railties/README b/railties/README
index c8446e4e55..4d58c3276c 100644
--- a/railties/README
+++ b/railties/README
@@ -38,7 +38,7 @@ link:files/vendor/actionpack/README.html.
 
 == Getting started
 
-1. Run the WEBrick servlet: <tt>ruby public/dispatch.servlet</tt>
+1. Run the WEBrick servlet: <tt>ruby script/server</tt>
    (run with --help for options)
 2. Go to http://localhost:3000/ and get "Congratulations, you've put Ruby on Rails!"
 3. Follow the guidelines on the "Congratulations, you're on Rails!" screen
diff --git a/railties/Rakefile b/railties/Rakefile
index 088bfbe74e..dc3f7a9679 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -21,7 +21,7 @@ TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/testing
 
 LOG_FILES    = %w( apache.log development.log test.log production.log )
 HTML_FILES   = %w( 404.html 500.html index.html )
-BIN_FILES    = %w( generate breakpointer envcon )
+BIN_FILES    = %w( generate breakpointer envcon server )
 GENERATORS   = %w( controller mailer model scaffold )
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer railties )
@@ -109,8 +109,6 @@ task :copy_dispatches do
   cp "dispatches/dispatch.fcgi", "#{PKG_DESTINATION}/public/dispatch.fcgi"
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.fcgi"
 
-  cp "dispatches/dispatch.servlet", "#{PKG_DESTINATION}/public/dispatch.servlet"
-
   cp "bin/envcon", "#{PKG_DESTINATION}/script/envcon"
   chmod 0755, "#{PKG_DESTINATION}/script/envcon"
 end
diff --git a/railties/dispatches/dispatch.servlet b/railties/bin/server
similarity index 100%
rename from railties/dispatches/dispatch.servlet
rename to railties/bin/server
diff --git a/railties/configs/apache.conf b/railties/configs/apache.conf
index 2edf69beb7..1ba845cdee 100755
--- a/railties/configs/apache.conf
+++ b/railties/configs/apache.conf
@@ -9,8 +9,6 @@ RewriteEngine On
 # Change extension from .cgi to .fcgi to switch to FCGI and to .rb to switch to mod_ruby
 RewriteBase /dispatch.cgi
 
-RewriteRule ^dispatch.servlet$ /  [R]
-
 # Enable this rewrite rule to point to the controller/action that should serve root.
 # RewriteRule ^$ /controller/action