diff --git a/Gemfile b/Gemfile
index 05f5f93dbb6..190054f5500 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,9 +32,9 @@ gem 'jquery-rails'
 gem 'mocha', '~> 1.13'
 gem 'mimemagic', '~> 0.3.10'
 gem 'mustermann' , '1.1.1'
-gem 'omniauth', '~> 1.9'
+gem 'omniauth', '~> 2.0'
 gem 'omniauth-facebook', '~> 9.0'
-gem 'omniauth-github', '~> 1.4'
+gem 'omniauth-github', '~> 2.0'
 gem 'omniauth-google-oauth2'
 gem 'omniauth-twitter'
 gem "paperclip", "~> 6.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index ec6daf53d63..a819e677e53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -365,29 +365,30 @@ GEM
       racc (~> 1.4)
     nokogumbo (2.0.4)
       nokogiri (~> 1.8, >= 1.8.4)
-    oauth (0.5.6)
+    oauth (0.5.8)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.1)
+    omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
+      rack-protection
     omniauth-facebook (9.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-github (2.0.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
     omniauth-google-oauth2 (0.8.1)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.6)
-    omniauth-oauth (1.1.0)
+    omniauth-oauth (1.2.0)
       oauth
-      omniauth (~> 1.0)
+      omniauth (>= 1.0, < 3)
     omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
@@ -728,9 +729,9 @@ DEPENDENCIES
   mustermann (= 1.1.1)
   mysql2 (>= 0.4.4)
   nifty-generators
-  omniauth (~> 1.9)
+  omniauth (~> 2.0)
   omniauth-facebook (~> 9.0)
-  omniauth-github (~> 1.4)
+  omniauth-github (~> 2.0)
   omniauth-google-oauth2
   omniauth-twitter
   openssl (~> 2.2.1)