diff --git a/Gemfile b/Gemfile
index 2d7d5aa87..36097fdd9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'sinatra', '1.2.6'
+gem 'sinatra', '2.2.3'
 gem 'thin', '1.2.7'
 gem 'maruku', '0.6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a934fa1d..949025083 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,21 +5,28 @@ GEM
     eventmachine (0.12.10)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    rack (1.3.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    mustermann (2.0.2)
+      ruby2_keywords (~> 0.0.1)
+    rack (2.2.4)
+    rack-protection (2.2.3)
+      rack
+    ruby2_keywords (0.0.5)
+    sinatra (2.2.3)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.3)
+      tilt (~> 2.0)
     syntax (1.0.0)
     thin (1.2.7)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.3.2)
+    tilt (2.0.11)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   maruku (= 0.6.0)
-  sinatra (= 1.2.6)
+  sinatra (= 2.2.3)
   thin (= 1.2.7)