diff --git a/libexec/rbenv b/libexec/rbenv
index 74ab8928..b979ca85 100755
--- a/libexec/rbenv
+++ b/libexec/rbenv
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 abs_dirname() {
   local cwd="$(pwd)"
diff --git a/libexec/rbenv-commands b/libexec/rbenv-commands
index 49ba268b..43846ce4 100755
--- a/libexec/rbenv-commands
+++ b/libexec/rbenv-commands
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 shopt -s nullglob
 
diff --git a/libexec/rbenv-exec b/libexec/rbenv-exec
index a538a52f..3e3929d9 100755
--- a/libexec/rbenv-exec
+++ b/libexec/rbenv-exec
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 RBENV_COMMAND="$1"
 if [ -z "$RBENV_COMMAND" ]; then
diff --git a/libexec/rbenv-help b/libexec/rbenv-help
index 2b1bba08..8820b200 100755
--- a/libexec/rbenv-help
+++ b/libexec/rbenv-help
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 print_set_version() {
   echo "<version> should be a string matching a Ruby version known by rbenv."
diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index 6b9765f2..d695879b 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 print=""
 if [ "$1" = "-" ]; then
diff --git a/libexec/rbenv-prefix b/libexec/rbenv-prefix
index f65701f6..3f22e7ee 100755
--- a/libexec/rbenv-prefix
+++ b/libexec/rbenv-prefix
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 if [ -n "$1" ]; then
   RBENV_VERSION="$1"
diff --git a/libexec/rbenv-rehash b/libexec/rbenv-rehash
index 6254d0aa..0259fe1b 100755
--- a/libexec/rbenv-rehash
+++ b/libexec/rbenv-rehash
@@ -1,8 +1,10 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 create_prototype_shim() {
   cat > .rbenv-shim <<SH
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 exec rbenv exec "\${0##*/}" "\$@"
 SH
   chmod +x .rbenv-shim
diff --git a/libexec/rbenv-set-default b/libexec/rbenv-set-default
index e1d65e2d..ba6bbb5c 100755
--- a/libexec/rbenv-set-default
+++ b/libexec/rbenv-set-default
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then
diff --git a/libexec/rbenv-set-local b/libexec/rbenv-set-local
index a051c709..7ce0fe2f 100755
--- a/libexec/rbenv-set-local
+++ b/libexec/rbenv-set-local
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then
diff --git a/libexec/rbenv-version b/libexec/rbenv-version
index 1143c70d..b3b2cdf0 100755
--- a/libexec/rbenv-version
+++ b/libexec/rbenv-version
@@ -1,3 +1,4 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 echo "$(rbenv-version-name) (set by $(rbenv-version-origin))"
diff --git a/libexec/rbenv-version-name b/libexec/rbenv-version-name
index fd2f1665..9b2c7810 100755
--- a/libexec/rbenv-version-name
+++ b/libexec/rbenv-version-name
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 read_version_file() {
   egrep -m 1 '[^[:space:]]' "$1"
diff --git a/libexec/rbenv-version-origin b/libexec/rbenv-version-origin
index 38e4f3d5..e4e6d552 100755
--- a/libexec/rbenv-version-origin
+++ b/libexec/rbenv-version-origin
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 find_version_file() {
   local root="$(pwd)"
diff --git a/libexec/rbenv-versions b/libexec/rbenv-versions
index 32b56c5b..a67a8ffa 100755
--- a/libexec/rbenv-versions
+++ b/libexec/rbenv-versions
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 RBENV_VERSION_NAME="$(rbenv-version-name)"
 
diff --git a/libexec/rbenv-whence b/libexec/rbenv-whence
index b6809a56..591ad6cd 100755
--- a/libexec/rbenv-whence
+++ b/libexec/rbenv-whence
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 if [ "$1" = "--path" ]; then
   print_paths="1"
diff --git a/libexec/rbenv-which b/libexec/rbenv-which
index d6360b0b..5e605628 100755
--- a/libexec/rbenv-which
+++ b/libexec/rbenv-which
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 expand_path() {
   local cwd="$(pwd)"