diff --git a/bin/rbenv-rehash b/bin/rbenv-rehash
index 8bbd53b6..7344a687 100755
--- a/bin/rbenv-rehash
+++ b/bin/rbenv-rehash
@@ -5,5 +5,10 @@ cd "${HOME}/.rbenv/shims"
 rm -f *
 
 for file in ../versions/*/bin/*; do
-  ln -fs ../bin/rbenv-shim "${file##*/}"
+  shim="${file##*/}"
+  cat > "$shim" <<SH
+#!/bin/sh
+exec rbenv exec ${file##*/} \$@
+SH
+  chmod +x "$shim"
 done
diff --git a/bin/rbenv-shim b/bin/rbenv-shim
deleted file mode 100755
index 0acca18f..00000000
--- a/bin/rbenv-shim
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-exec rbenv-exec "${0##*/}" "$@"