diff --git a/lib/middleman/guard.rb b/lib/middleman/guard.rb
index ac539bcb..992f86f7 100644
--- a/lib/middleman/guard.rb
+++ b/lib/middleman/guard.rb
@@ -56,11 +56,13 @@ module Guard
     def server_start
       @server_options = { 
         :Port => @options[:port],
-        :Logger => ::WEBrick::Log.new('/dev/null'),
-        :AccessLog => ::WEBrick::Log.new('/dev/null')
+        :AccessLog => []
+        # :AccessLog => ::WEBrick::Log.new('/dev/null'),
+        # :Logger => ::WEBrick::Log.new('/dev/null')
       }
       @server_job = fork do
         @server_options[:app] = ::Middleman.server.new
+        @server_options[:server] = 'thin'
         ::Rack::Server.new(@server_options).start
       end
 
diff --git a/middleman.gemspec b/middleman.gemspec
index 695d3913..4ec60db4 100644
--- a/middleman.gemspec
+++ b/middleman.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("rack", ["~> 1.3.0"])
+  s.add_runtime_dependency("thin", ["~> 1.2.11"])
   s.add_runtime_dependency("thor", ["~> 0.14.0"])
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])