diff --git a/bin/portzap b/bin/portzap
index a24e9f9..6e12661 100755
--- a/bin/portzap
+++ b/bin/portzap
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/bin/setup-portzap b/bin/setup-portzap
index efe1269..26bcaa9 100755
--- a/bin/setup-portzap
+++ b/bin/setup-portzap
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/git-changed-files b/libexec/portzap/git-changed-files
index 553b8c0..adb53fc 100644
--- a/libexec/portzap/git-changed-files
+++ b/libexec/portzap/git-changed-files
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/git-removed-files b/libexec/portzap/git-removed-files
index c2319d7..23209d9 100644
--- a/libexec/portzap/git-removed-files
+++ b/libexec/portzap/git-removed-files
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/git-rev b/libexec/portzap/git-rev
index b8f4d50..eab8f9e 100644
--- a/libexec/portzap/git-rev
+++ b/libexec/portzap/git-rev
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/isportzap-member b/libexec/portzap/isportzap-member
index 696fcde..3517c46 100644
--- a/libexec/portzap/isportzap-member
+++ b/libexec/portzap/isportzap-member
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 group="_portzap"
 if id -Gn | \
diff --git a/libexec/portzap/portzap-clone b/libexec/portzap/portzap-clone
index 715f326..83ab39a 100755
--- a/libexec/portzap/portzap-clone
+++ b/libexec/portzap/portzap-clone
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/portzap-erase b/libexec/portzap/portzap-erase
index 80a2bc6..32e7617 100644
--- a/libexec/portzap/portzap-erase
+++ b/libexec/portzap/portzap-erase
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/portzap-install b/libexec/portzap/portzap-install
index 34ed330..322538e 100755
--- a/libexec/portzap/portzap-install
+++ b/libexec/portzap/portzap-install
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables
diff --git a/libexec/portzap/portzap-pull b/libexec/portzap/portzap-pull
index 9f0fb72..10a70db 100755
--- a/libexec/portzap/portzap-pull
+++ b/libexec/portzap/portzap-pull
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 ##
 # variables