diff --git a/Gemfile b/Gemfile
index 7010e4a6..d893a035 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem "sinatra", '1.2.6'
 gem "haml"
 gem "sass"
 gem "json"
-gem "thin"
+gem "puma"
 gem "RubyInline"
 gem "ZenTest", '<= 4.6.0'   # dependency of RubyInline, newer versions break Heroku deploy
 gem "png"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7115894c..f02c3530 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,10 +20,7 @@ GEM
       mime-types (~> 1.15)
       multi_json (~> 1.0)
       rest-client (~> 1.6.1)
-    daemons (1.1.8)
     diff-lcs (1.1.3)
-    eventmachine (0.12.10)
-    eventmachine (0.12.10-java)
     excon (0.15.5)
     ffi (1.1.3)
     ffi (1.1.3-java)
@@ -57,6 +54,8 @@ GEM
     nokogiri (1.5.5)
     nokogiri (1.5.5-java)
     png (1.2.0)
+    puma (1.6.3)
+      rack (~> 1.2)
     rack (1.4.1)
     rack-test (0.5.6)
       rack (>= 1.0)
@@ -100,10 +99,6 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     spoon (0.0.1)
-    thin (1.4.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     tilt (1.3.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -123,6 +118,7 @@ DEPENDENCIES
   launchy
   memcache-client
   png
+  puma
   rack-test (= 0.5.6)
   rake
   rest-client
@@ -136,4 +132,3 @@ DEPENDENCIES
   sass
   selenium-webdriver (= 2.22.2)
   sinatra (= 1.2.6)
-  thin
diff --git a/Procfile b/Procfile
index 994785ce..84f525a8 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: bundle exec thin start -R server/sinatra/config.ru -p $PORT
\ No newline at end of file
+web: bundle exec puma -C server/sinatra/procfile_puma_config.rb -e production -p $PORT
diff --git a/ReadMe.md b/ReadMe.md
index 1d2cfb1d..00cef145 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -113,7 +113,7 @@ The server is a ruby bundle. Get the bundler gem and then use it to get everythi
 Launch the server with this bundle command:
 
 	cd server/sinatra
-	bundle exec rackup -s thin -p 1111
+	bundle exec rackup -s puma -p 1111
 
 Now go to your browser and browse your new wiki:
 
@@ -174,5 +174,5 @@ for those not using Ruby much, but using Debian:
     sudo gem install bundle
     sudo /var/lib/gems/1.8/bin/bundle install
     rvm 1.9.2
-    /var/lib/gems/1.8/bin/bundle exec rackup -s thin -p 1111
+    /var/lib/gems/1.8/bin/bundle exec rackup -s puma -p 1111
 
diff --git a/server/sinatra/procfile_puma_config.rb b/server/sinatra/procfile_puma_config.rb
new file mode 100644
index 00000000..1282f1da
--- /dev/null
+++ b/server/sinatra/procfile_puma_config.rb
@@ -0,0 +1 @@
+rackup './server/sinatra/config.ru'