diff --git a/Gemfile b/Gemfile
index 7a02987..8f2b5b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'nokogiri'
 gem 'rack-codehighlighter'
 gem 'redcarpet'
 gem 'sass'
-gem 'sinatra', '~> 1.3.0'
+gem 'sinatra', '~> 2.2.0'
 gem 'thin'
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 45fba45..0bba629 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,8 @@ GEM
     method_source (0.8.2)
     mini_portile (0.5.2)
     multi_json (1.8.4)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     nokogiri (1.6.1-x86-mingw32)
@@ -49,11 +51,11 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
       win32console (~> 1.3)
-    rack (1.5.2)
+    rack (2.2.3)
     rack-codehighlighter (0.5.0)
       nokogiri (>= 1.4.1)
       rack (>= 1.0.0)
-    rack-protection (1.5.2)
+    rack-protection (2.2.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -74,6 +76,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    ruby2_keywords (0.0.5)
     ruby2ruby (2.0.7)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
@@ -81,16 +84,17 @@ GEM
       sexp_processor (~> 4.1)
     sass (3.2.14)
     sexp_processor (4.4.1)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (2.2.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.0)
+      tilt (~> 2.0)
     slop (3.4.7)
     thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    tilt (1.4.1)
+    tilt (2.0.10)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -126,6 +130,6 @@ DEPENDENCIES
   rerun
   rspec
   sass
-  sinatra (~> 1.3.0)
+  sinatra (~> 2.2.0)
   thin
   wrong (~> 0.7.0)