diff --git a/Gemfile b/Gemfile
index 8c0aa83..76750a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ group :assets do
 end
 
 group :production do
-  gem 'thin'
+  gem 'puma'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index b13a9fb..584edd0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,14 +42,12 @@ GEM
       execjs
     coffee-script-source (1.3.1)
     crack (0.3.1)
-    daemons (1.1.8)
     devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)
       warden (~> 1.1.1)
     erubis (2.7.0)
-    eventmachine (0.12.10)
     execjs (1.3.0)
       multi_json (~> 1.0)
     fastercsv (1.5.4)
@@ -81,6 +79,8 @@ GEM
     orm_adapter (0.0.7)
     pg (0.13.2)
     polyglot (0.3.3)
+    puma (1.2.1)
+      rack (~> 1.2)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -137,10 +137,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    thin (1.3.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -169,12 +165,12 @@ DEPENDENCIES
   haml (~> 3.2.0.alpha)
   http_accept_language
   pg
+  puma
   rails (~> 3.2)
   rails_admin
   sass-rails
   simplecov
   sqlite3
-  thin
   uglifier
   validates_formatting_of
   webmock
diff --git a/Procfile b/Procfile
index b41d8da..4fd3163 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: bundle exec rails server thin -p $PORT
+web: bundle exec puma -p $PORT