diff --git a/Changelog.md b/Changelog.md
index 91c3c0492..1aaf65ced 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -118,6 +118,7 @@ Contributions are very welcome, the hard work is done!
 ## Bug fixes
 * Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
 * Fix `suppress_annoying_errors` eating too much errors [#6653](https://github.com/diaspora/diaspora/pull/6653)
+* Ensure the rubyzip gem is properly loaded [#6659](https://github.com/diaspora/diaspora/pull/6659)
 
 ## Features
 * Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
diff --git a/Gemfile b/Gemfile
index 15c18dd0f..bf822266c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -186,7 +186,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"
 
 # Reading and writing zip files
 
-gem "rubyzip", "1.1.7"
+gem "rubyzip", "1.1.7", require: "zip"
 
 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs: