diff --git a/Gemfile b/Gemfile
index 18fd72f6..28c051b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ ruby '1.9.3' rescue nil
 source :rubygems
 gemspec
 
+gem 'puma'
 gem 'travis-support', github: 'travis-ci/travis-support'
 gem 'travis-core',    github: 'travis-ci/travis-core', branch: 'sf-travis-api'
 gem 'hubble',         github: 'roidrage/hubble'
diff --git a/Gemfile.lock b/Gemfile.lock
index 375bff6a..74e05db3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 6c02e7a1ddddc73054bd7eb351c53ce8523d7cb1
+  revision: fedf82724c26f4f868d6d9a9d7f7568aeb663edb
   branch: sf-travis-api
   specs:
     travis-core (0.0.1)
@@ -165,6 +165,8 @@ GEM
       actionmailer
       postmark (>= 0.9.0)
       rake
+    puma (1.6.3)
+      rack (~> 1.2)
     pusher (0.9.4)
       multi_json (~> 1.0)
       signature (~> 0.1.2)
@@ -244,6 +246,7 @@ DEPENDENCIES
   hubble!
   micro_migrations!
   mocha (~> 0.12)
+  puma
   rack-cache (~> 1.2)
   rack-contrib!
   rake (~> 0.9.2)
diff --git a/script/server b/script/server
index 569491a1..a17c4245 100755
--- a/script/server
+++ b/script/server
@@ -3,6 +3,6 @@ cd "$(dirname "$0")/.."
 [ $PORT ]     || PORT=3000
 [ $RACK_ENV ] || RACK_ENV=development
 
-cmd="ruby -I lib -S bundle exec ruby -I lib -S thin start -p $PORT -e $RACK_ENV" #--threaded"
-[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -a 127.0.0.1"
+cmd="ruby -I lib -S bundle exec ruby -I lib -S puma config.ru -p $PORT -e $RACK_ENV --threads 0:16"
+[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -b tcp://127.0.0.1:$PORT"
 exec $cmd