diff --git a/puke b/puke
index 116cacce..bad8ceee 100755
--- a/puke
+++ b/puke
@@ -98,8 +98,7 @@ pkg_extract() {
 }
 
 pkg_build() {
-    (set -e errexit; cd "$mak_dir"; "$OLDPWD/build" "$pkg_dir") ||
-        die "Build failed."
+    (cd "$mak_dir"; "$OLDPWD/build" "$pkg_dir") || die "Build failed."
 
     cp -R "$rep_dir/$name" "$pkg_dir/$dbs_dir"
 
diff --git a/repo/busybox/build b/repo/busybox/build
index 5012067d..ec3bd8cc 100755
--- a/repo/busybox/build
+++ b/repo/busybox/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 make
 make install
diff --git a/repo/ca-certificates/build b/repo/ca-certificates/build
index 1d88d13a..173a700b 100755
--- a/repo/ca-certificates/build
+++ b/repo/ca-certificates/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 gcc certdata2pem.c -o "mozilla/certdata2pem"
 
diff --git a/repo/ca-certificates/post-install b/repo/ca-certificates/post-install
index 477981e0..c65ac9e4 100755
--- a/repo/ca-certificates/post-install
+++ b/repo/ca-certificates/post-install
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e
 
 /usr/sbin/update-ca-certificates --fresh
diff --git a/repo/hummingbird/build b/repo/hummingbird/build
index 4517745b..469fe9af 100755
--- a/repo/hummingbird/build
+++ b/repo/hummingbird/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 make
 make DESTDIR="$1" install
diff --git a/repo/m4/build b/repo/m4/build
index ede6329b..af868c8e 100755
--- a/repo/m4/build
+++ b/repo/m4/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 patch -p1 -i fix-glibc-2.28.patch
 
diff --git a/repo/openssl/build b/repo/openssl/build
index d55ed86a..286305de 100755
--- a/repo/openssl/build
+++ b/repo/openssl/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 ./Configure linux-x86_64 \
     --prefix=/usr \
diff --git a/repo/perl/build b/repo/perl/build
index 55988303..70b9365c 100755
--- a/repo/perl/build
+++ b/repo/perl/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 BUILD_ZLIB=0
 BUILD_BZIP2=0
diff --git a/repo/zlib/build b/repo/zlib/build
index 6053333a..f4b45b25 100755
--- a/repo/zlib/build
+++ b/repo/zlib/build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 ./configure \
     --prefix=/usr \