diff --git a/bin/rbenv b/bin/rbenv
index c9519604..30f1a189 100755
--- a/bin/rbenv
+++ b/bin/rbenv
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 command="$1"
 if [ -z "$command" ]; then
diff --git a/bin/rbenv-exec b/bin/rbenv-exec
index 59a122b8..16039d85 100755
--- a/bin/rbenv-exec
+++ b/bin/rbenv-exec
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 RBENV_COMMAND="$1"
 if [ -z "$RBENV_COMMAND" ]; then
diff --git a/bin/rbenv-path b/bin/rbenv-path
index ba77369b..a37c9edc 100755
--- a/bin/rbenv-path
+++ b/bin/rbenv-path
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 if [ -n "$1" ]; then
   RBENV_VERSION="$1"
diff --git a/bin/rbenv-rehash b/bin/rbenv-rehash
index 692cfacc..8bbd53b6 100755
--- a/bin/rbenv-rehash
+++ b/bin/rbenv-rehash
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 mkdir -p "${HOME}/.rbenv/shims"
 cd "${HOME}/.rbenv/shims"
diff --git a/bin/rbenv-set-default b/bin/rbenv-set-default
index 0632747a..a36f2319 100755
--- a/bin/rbenv-set-default
+++ b/bin/rbenv-set-default
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then
diff --git a/bin/rbenv-set-local b/bin/rbenv-set-local
index 0f2a1bf5..59512db1 100755
--- a/bin/rbenv-set-local
+++ b/bin/rbenv-set-local
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 RBENV_VERSION="$1"
 if [ -z "$RBENV_VERSION" ]; then
diff --git a/bin/rbenv-shim b/bin/rbenv-shim
index b2341800..0acca18f 100755
--- a/bin/rbenv-shim
+++ b/bin/rbenv-shim
@@ -1,5 +1,3 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 exec rbenv-exec "${0##*/}" "$@"
diff --git a/bin/rbenv-version b/bin/rbenv-version
index 605c7552..1337e367 100755
--- a/bin/rbenv-version
+++ b/bin/rbenv-version
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 read_version_file() {
   egrep -m 1 '[^[:space:]]' "$1"
diff --git a/bin/rbenv-versions b/bin/rbenv-versions
index 97f217c2..b3faad6f 100755
--- a/bin/rbenv-versions
+++ b/bin/rbenv-versions
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 RBENV_VERSION="$(rbenv-version)"
 
diff --git a/bin/rbenv-which b/bin/rbenv-which
index c14134e2..cb63d8d5 100755
--- a/bin/rbenv-which
+++ b/bin/rbenv-which
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 RBENV_VERSION="$(rbenv-version)"
 RBENV_COMMAND="$1"