diff --git a/Changelog.md b/Changelog.md
index 2b157e134..790489e19 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@
 * Improve the logging messages of Sidekiq messages [#5988](https://github.com/diaspora/diaspora/pull/5988)
 * Improve the logging of Eyes output [#5989](https://github.com/diaspora/diaspora/pull/5989)
 * Gracefully handle XML parse errors within federation [#5991](https://github.com/diaspora/diaspora/pull/5991)
+* Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001)
 
 ## Bug fixes
 * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
diff --git a/Gemfile b/Gemfile
index 5820c0887..537928c80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -173,9 +173,9 @@ gem "rails-timeago",           "2.11.0"
 
 gem "logging-rails", "0.5.0", require: "logging/rails"
 
-# # Workarounds
-# # https://github.com/rubyzip/rubyzip#important-note
-gem "rubyzip"
+# Reading and writing zip files
+
+gem "rubyzip", "1.1.7"
 
 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs:
diff --git a/Gemfile.lock b/Gemfile.lock
index e9d965d52..cfd7d8e8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -828,7 +828,7 @@ DEPENDENCIES
   rspec-rails (= 3.2.1)
   rubocop (= 0.31.0)
   ruby-oembed (= 0.8.14)
-  rubyzip
+  rubyzip (= 1.1.7)
   sass-rails (= 5.0.1)
   selenium-webdriver (= 2.45.0)
   shoulda-matchers (= 2.8.0)
diff --git a/config/initializers/rubyzip.rb b/config/initializers/rubyzip.rb
deleted file mode 100644
index 00b352494..000000000
--- a/config/initializers/rubyzip.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# https://github.com/rubyzip/rubyzip#configuration
-# Zip.setup do |c|
-#   c.on_exists_proc = true
-#   c.continue_on_exists_proc = true
-#   c.unicode_names = true
-#   c.default_compression = Zlib::BEST_COMPRESSION
-# end