diff --git a/config/software/gitlab-shell.rb b/config/software/gitlab-shell.rb
index 87caa8c..b93e097 100644
--- a/config/software/gitlab-shell.rb
+++ b/config/software/gitlab-shell.rb
@@ -25,7 +25,22 @@ dependency "rsync"
 source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
 
 build do
-  command "sed -i 's|^#!/usr/bin/env ruby|#!#{install_dir}/embedded/bin/ruby|' $(grep -r -l '#!/usr/bin/env ruby' .)"
+  block do
+    `grep -r -l '#!/usr/bin/env ruby' #{project_dir}`.split("\n").each do |ruby_script|
+      File.open(ruby_script, "r+") do |file|
+        script = file.read
+        file.rewind
+        file.truncate(0)
+        file.print <<-EOH
+#!/opt/gitlab/embedded/bin/ruby
+# Fix the PATH so that gitlab-shell can find git-upload-pack and friends.
+ENV['PATH'] = '/opt/gitlab/bin:/opt/gitlab/embedded/bin:' + ENV['PATH']
+
+        EOH
+        file.print script
+      end
+    end
+  end
   command "mkdir -p #{install_dir}/embedded/service/gitlab-shell"
   command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-shell/"
 end
--
libgit2 0.21.2