diff --git a/libexec/rbenv b/libexec/rbenv
index 253d08bc..16e57108 100755
--- a/libexec/rbenv
+++ b/libexec/rbenv
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 abs_dirname() {
   orig_dir=`pwd`
diff --git a/libexec/rbenv-exec b/libexec/rbenv-exec
index 16039d85..ffd911b9 100755
--- a/libexec/rbenv-exec
+++ b/libexec/rbenv-exec
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_COMMAND="$1"
 if [ -z "$RBENV_COMMAND" ]; then
diff --git a/libexec/rbenv-path b/libexec/rbenv-path
index a37c9edc..a60c806b 100755
--- a/libexec/rbenv-path
+++ b/libexec/rbenv-path
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 if [ -n "$1" ]; then
   RBENV_VERSION="$1"
diff --git a/libexec/rbenv-rehash b/libexec/rbenv-rehash
old mode 100755
new mode 100644
index 8bbd53b6..c0096616
--- a/libexec/rbenv-rehash
+++ b/libexec/rbenv-rehash
@@ -1,9 +1,14 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 mkdir -p "${HOME}/.rbenv/shims"
 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 $shim "\$@"
+SH
+  chmod +x "$shim"
 done
diff --git a/libexec/rbenv-set-default b/libexec/rbenv-set-default
index a36f2319..a1922a76 100755
--- a/libexec/rbenv-set-default
+++ b/libexec/rbenv-set-default
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then
diff --git a/libexec/rbenv-set-local b/libexec/rbenv-set-local
index 59512db1..38406232 100755
--- a/libexec/rbenv-set-local
+++ b/libexec/rbenv-set-local
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then
diff --git a/libexec/rbenv-shim b/libexec/rbenv-shim
deleted file mode 100755
index 0acca18f..00000000
--- a/libexec/rbenv-shim
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e
-
-exec rbenv-exec "${0##*/}" "$@"
diff --git a/libexec/rbenv-version b/libexec/rbenv-version
index 1337e367..01c1afdf 100755
--- a/libexec/rbenv-version
+++ b/libexec/rbenv-version
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 read_version_file() {
   egrep -m 1 '[^[:space:]]' "$1"
diff --git a/libexec/rbenv-versions b/libexec/rbenv-versions
index b3faad6f..6b848c07 100755
--- a/libexec/rbenv-versions
+++ b/libexec/rbenv-versions
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$(rbenv-version)"
 
diff --git a/libexec/rbenv-which b/libexec/rbenv-which
index cb63d8d5..0e05c81b 100755
--- a/libexec/rbenv-which
+++ b/libexec/rbenv-which
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env bash -e
 
 RBENV_VERSION="$(rbenv-version)"
 RBENV_COMMAND="$1"