diff --git a/Gemfile b/Gemfile
index 978de6e..b7abcc5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,10 +25,8 @@ gem 'json', '>=1.8.0'
 gem 'json_pure', '=1.8.0'
 gem 'multi_json', '=1.7.7'
 gem 'pg', '>=0.15.1'
-gem 'rack', '>=1.5.2'
-gem 'rack-protection', '1.5.5'
-gem 'sinatra', '=1.4.3'
+gem 'rack', '>=2.1.4'
+gem 'sinatra', '>=2.1.0'
 gem 'stringex', '=1.5.1'
 gem 'thin', '=1.5.1'
-gem 'tilt', '=1.4.1'
 gem 'uuidtools', '=2.1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index f7dd333..a57d020 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,29 +53,33 @@ GEM
       dm-core (~> 1.2.0)
     do_postgres (0.10.17)
       data_objects (= 0.10.17)
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
     fastercsv (1.5.5)
     json (1.8.6)
     json_pure (1.8.0)
     multi_json (1.7.7)
-    pg (0.21.0)
-    rack (1.6.12)
-    rack-protection (1.5.5)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    pg (1.2.3)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    sinatra (1.4.3)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+    ruby2_keywords (0.0.4)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
     stringex (1.5.1)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.4.1)
+    tilt (2.0.10)
     uuidtools (2.1.4)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   addressable (= 2.3.4)
@@ -103,13 +107,11 @@ DEPENDENCIES
   json_pure (= 1.8.0)
   multi_json (= 1.7.7)
   pg (>= 0.15.1)
-  rack (>= 1.5.2)
-  rack-protection (= 1.5.5)
-  sinatra (= 1.4.3)
+  rack (>= 2.1.4)
+  sinatra (>= 2.1.0)
   stringex (= 1.5.1)
   thin (= 1.5.1)
-  tilt (= 1.4.1)
   uuidtools (= 2.1.4)
 
 BUNDLED WITH
-   1.13.6
+   2.2.5