diff --git a/Gemfile b/Gemfile
index e32e523b..ade22604 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'sinatra', '~> 1.0'
+gem 'sinatra', '~> 2.2'
 gem 'shotgun', :group => :reloadable
 gem 'thin', :group => :reloadable
 gem 'json'
diff --git a/Gemfile.lock b/Gemfile.lock
index 42460e58..15307f7a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,17 +4,24 @@ GEM
     daemons (1.1.0)
     eventmachine (0.12.10)
     json (1.4.6)
-    rack (1.2.1)
+    mustermann (2.0.2)
+      ruby2_keywords (~> 0.0.1)
+    rack (2.2.4)
+    rack-protection (2.2.3)
+      rack
+    ruby2_keywords (0.0.5)
     shotgun (0.8)
       rack (>= 1.0)
-    sinatra (1.1.2)
-      rack (~> 1.1)
-      tilt (~> 1.2)
+    sinatra (2.2.3)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.3)
+      tilt (~> 2.0)
     thin (1.2.7)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.2.1)
+    tilt (2.0.11)
 
 PLATFORMS
   ruby
@@ -22,5 +29,5 @@ PLATFORMS
 DEPENDENCIES
   json
   shotgun
-  sinatra (~> 1.0)
+  sinatra (~> 2.2)
   thin