diff --git a/README.rdoc b/README.rdoc
index c9fdb279..6a38a37c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -346,6 +346,8 @@ The following people have dedicated their time and effort to Capybara:
 * Dan Dofter
 * Thorbjørn Hermansen
 * Louis T.
+* Stephan Hagemann
+* Graham Ashton
 
 == License:
 
diff --git a/lib/capybara/server.rb b/lib/capybara/server.rb
index 9bffb3d9..114ea8e6 100644
--- a/lib/capybara/server.rb
+++ b/lib/capybara/server.rb
@@ -1,11 +1,6 @@
 require 'uri'
 require 'net/http'
 require 'rack'
-begin
-  require 'rack/handler/mongrel'
-rescue LoadError
-  require 'rack/handler/webrick'
-end
 
 class Capybara::Server
   class Identify
@@ -52,8 +47,10 @@ class Capybara::Server
     Timeout.timeout(10) do
       Thread.new do
         begin
+          require 'rack/handler/mongrel'
           Rack::Handler::Mongrel.run(Identify.new(@app), :Port => port)
         rescue LoadError
+          require 'rack/handler/webrick'
           Rack::Handler::WEBrick.run(Identify.new(@app), :Port => port, :AccessLog => [])
         end
       end