diff --git a/Gemfile b/Gemfile
index 0cb21bcf..7b24cd70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,8 @@ gem 'omniauth-tumblr'
 
 # OAuth clients
 gem 'twitter'
-gem 'tumblr_client'
+# To use a more recent Faraday version, a fork of this gem is required.
+gem 'tumblr_client', git: 'https://github.com/amplifr/tumblr_client'
 
 gem 'foreman'
 gem 'redis'
diff --git a/Gemfile.lock b/Gemfile.lock
index bea016a8..fadaaf1e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,15 @@
+GIT
+  remote: https://github.com/amplifr/tumblr_client
+  revision: 3927ee366598a9b70b095933ded32e45f730b652
+  specs:
+    tumblr_client (0.8.5)
+      faraday
+      faraday_middleware
+      json
+      mime-types
+      oauth
+      simple_oauth
+
 GIT
   remote: https://github.com/retrospring/questiongenerator.git
   revision: c5f8362ff769425d42a94b3a611731eadaa5e0ca
@@ -151,10 +163,10 @@ GEM
       mail
     faker (2.2.1)
       i18n (>= 0.8)
-    faraday (0.9.2)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.2)
-      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     ffi (1.12.2)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -470,13 +482,6 @@ GEM
     tilt (2.0.10)
     tiny-color-rails (0.0.2)
       railties (>= 3.0)
-    tumblr_client (0.8.5)
-      faraday (~> 0.9.0)
-      faraday_middleware (~> 0.9.0)
-      json
-      mime-types
-      oauth
-      simple_oauth
     turbolinks (2.5.4)
       coffee-rails
     twitter (7.0.0)
@@ -591,7 +596,7 @@ DEPENDENCIES
   spring (~> 1.3.5)
   sweetalert-rails
   tiny-color-rails
-  tumblr_client
+  tumblr_client!
   turbolinks (~> 2.5.3)
   twitter
   uglifier (>= 1.3.0)