diff --git a/lib/sinatra.rb b/lib/sinatra.rb
index f3544823..4d48f386 100644
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@@ -119,7 +119,8 @@ module Sinatra
   def server
     options.server ||= defined?(Rack::Handler::Thin) ? "thin" : "mongrel"
     # Convert the server into the actual handler name
-    handler = options.server.capitalize.sub(/cgi$/, 'CGI')
+    # Special cases for [Fast]CGI and WEBrick
+    handler = options.server.capitalize.sub(/cgi$/, 'CGI').sub(/^Webrick$/, 'WEBrick')
     @server ||= eval("Rack::Handler::#{handler}")
   end