diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index fdab43a159..ffe23daeca 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Use require_library_or_gem to load rake in commands/server.rb.  Closes #4205.  [rob.rasmussen@gmail.com]
+
 * Use the Rake API instead of shelling out to create the tmp directory in commands/server.rb. [Chad Fowler]
 
 * Added a backtrace to the evil WSOD (White Screen of Death).  Closes #4073. TODO: Clearer exceptions [Rick Olson]
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index d91a395b81..c9627439e8 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -25,7 +25,7 @@ else
   puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
 end
 
-require 'rake'
+require_library_or_gem 'rake'
 load File.join(File.dirname(__FILE__), "..", "tasks", "tmp.rake")
 begin
   Rake::Task['tmp:create'].execute