diff --git a/pkg/source/dist/.gitkeep b/pkg/source/dist/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/ubuntu/diaspora-install b/pkg/ubuntu/diaspora-install
index 4679c9f2b..fc4aebbf6 100755
--- a/pkg/ubuntu/diaspora-install
+++ b/pkg/ubuntu/diaspora-install
@@ -43,12 +43,19 @@ mkdir -p /var/lib/diaspora/tmp
 mkdir -p /var/run/diaspora
 mkdir -p /etc/diaspora
 
+bundle='/usr/lib/diaspora-bundle'
+[[ $(arch) == 'x86_64']] && bundle='/usr/lib64/diaspora-bundle'
+
 ln -sf /var/log/diaspora  ./master/log
 cp master/config/app_config.yml.example /etc/diaspora/app_config.yml
 ln -sf /etc/diaspora/app_config.yml master/config/app_config.yml
 ln -sf /var/lib/diaspora/uploads master/public/
 ln -sf /var/lib/diaspora/tmp master
-ln -sf /usr/lib/diaspora-bundle/vendor/bundle master/vendor
+rm -rf master/vendor
+ln -sf $bundle/vendor master/vendor
+
+ln -sf $bundle/Gemfile master/Gemfile
+ln -sf $bundle/Gemfile.lock master/Gemfile.lock
 
 rm -rf /usr/share/doc/diaspora
 mkdir -p /usr/share/doc/diaspora