diff --git a/Gemfile b/Gemfile
index ace60c8fd..d0e23f468 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,6 +102,9 @@ gem 'haml',                    '4.0.3'
 gem 'mobile-fu',               '1.2.1'
 gem 'will_paginate',           '3.0.4'
 
+# Workarounds
+# https://github.com/rubyzip/rubyzip#important-note
+gem 'zip-zip'
 
 ### GROUPS ####
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 194effc38..8a443de3e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -421,6 +421,8 @@ GEM
     will_paginate (3.0.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
+    zip-zip (0.2)
+      rubyzip (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -507,3 +509,4 @@ DEPENDENCIES
   unicorn (= 4.6.3)
   webmock (= 1.13.0)
   will_paginate (= 3.0.4)
+  zip-zip