diff --git a/Changelog.md b/Changelog.md
index 9a162a2a4..b836d1c97 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+# 0.6.0.1
+
+Fixes an issue with installing an running diaspora\*, caused by a recent bundler update that fixes a bundler bug on which we depended on.
+
 # 0.6.0.0
 
 ## Warning: This release contains long migrations
diff --git a/config/application.rb b/config/application.rb
index 6ef69fdb5..ca30da275 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,7 +1,7 @@
 require_relative 'boot'
 
 require 'rails/all'
-Bundler.require(:default, Rails.env)
+Bundler.require(:default, *Bundler.settings.with, Rails.env)
 
 # Do not dump the limit of boolean fields on MySQL,
 # since that generates a db/schema.rb that's incompatible
diff --git a/config/defaults.yml b/config/defaults.yml
index 624812000..88a98cda8 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.6.0.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.6.0.1" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"