diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 26a9057cf5..fdab43a159 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* 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]
 
 * Added tracking of database and framework versions in script/about #4088 [charles.gerungan@gmail.com/Rick Olson]
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index 85e3a64d60..d91a395b81 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -25,5 +25,10 @@ else
   puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
 end
 
-silence_stderr { `rake tmp:create` }
-require "commands/servers/#{server}"
\ No newline at end of file
+require 'rake'
+load File.join(File.dirname(__FILE__), "..", "tasks", "tmp.rake")
+begin
+  Rake::Task['tmp:create'].execute 
+rescue Errno::EEXIST => e 
+end
+require "commands/servers/#{server}"