diff --git a/.ruby-version b/.ruby-version
index df28eb54..7e541aec 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-1.9.3-p429
+2.2.2
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index e8dd6511..7090d3b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,11 +8,12 @@ group :extras do
 end
 
 gem 'thin' # needed by qless-web binary
+gem 'erubis'
 
 group :development do
-  gem 'byebug', :platforms => [:ruby_20, :ruby_21]
+  gem 'byebug', :platforms => [:ruby_20, :ruby_21, :ruby_22]
   gem 'pry'
-  gem 'pry-byebug', :platforms => [:ruby_20, :ruby_21]
+  gem 'pry-byebug', :platforms => [:ruby_20, :ruby_21, :ruby_22]
   gem 'pry-stack_explorer'
-  gem 'cane', :platforms => [:ruby_20, :ruby_21]
+  gem 'cane', :platforms => [:ruby_20, :ruby_21, :ruby_22]
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 81a6fcbe..22fa1bd6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,14 +31,10 @@ GEM
     columnize (0.3.6)
     daemons (1.1.9)
     debug_inspector (0.0.2)
-    debugger (1.6.2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
-    eventmachine (1.0.3)
+    erubis (2.7.0)
+    eventmachine (1.2.0)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     faye-websocket (0.4.7)
@@ -58,6 +54,7 @@ GEM
     mini_portile (0.5.1)
     multi_json (1.8.0)
     multipart-post (1.2.0)
+    mustermann (1.0.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     parallel (1.4.1)
@@ -81,8 +78,8 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rack (1.5.2)
-    rack-protection (1.5.0)
+    rack (2.0.9.1)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -118,16 +115,17 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
     slop (3.4.6)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.4.1)
+    tilt (2.0.0)
     timecop (0.7.1)
     uuidtools (2.1.4)
     vegas (0.1.11)
@@ -143,7 +141,7 @@ DEPENDENCIES
   byebug
   cane
   capybara (~> 1.1.2)
-  debugger
+  erubis
   faye-websocket (~> 0.4.0)
   launchy (~> 2.1.0)
   metriks (~> 0.9)
@@ -159,7 +157,10 @@ DEPENDENCIES
   rusage (~> 0.2.0)
   sentry-raven (~> 0.4)
   simplecov (~> 0.7.1)
-  sinatra (~> 1.3.2)
+  sinatra (~> 2.0.0)
   thin
   timecop (~> 0.7.1)
   vegas (~> 0.1.11)
+
+BUNDLED WITH
+   1.17.3
diff --git a/qless.gemspec b/qless.gemspec
index c423b2b6..7f3e0f92 100644
--- a/qless.gemspec
+++ b/qless.gemspec
@@ -37,7 +37,7 @@ language-specific extension will also remain up to date.
 
   s.add_dependency 'redis', '>= 2.2'
 
-  s.add_development_dependency 'sinatra'       , '~> 1.3.2'
+  s.add_development_dependency 'sinatra'       , '~> 2.0.0'
   s.add_development_dependency 'vegas'         , '~> 0.1.11'
   s.add_development_dependency 'rspec'         , '~> 2.12'
   s.add_development_dependency 'rspec-fire'    , '~> 1.1'