diff --git a/puke b/puke
index d914129e..6179cad5 100755
--- a/puke
+++ b/puke
@@ -27,7 +27,7 @@ pkg_setup() {
     cd "$rep_dir/$1" || die "Package '$1' not in repository."
     [ -f version ]   || die "Version file not found."
     [ -f sources ]   || die "Sources file not found."
-    [ -f build ]     || die "Build file not found."
+    [ -x build ]     || die "Build file not found or not executable."
 
     read -r version release < version
     pkg=${name:=$1}\#$version-$release
@@ -107,7 +107,7 @@ pkg_extract() {
 pkg_build() {
     log "Building $pkg."
 
-    (set -e errexit; cd "$mak_dir"; . "$OLDPWD/build") ||
+    (set -e errexit; cd "$mak_dir"; "$OLDPWD/build" "$pkg_dir" ) ||
         die "Build failed."
 
     cp -R "$rep_dir/$name" "$pkg_dir/$dbs_dir"
diff --git a/repo/ca-certificates/build b/repo/ca-certificates/build
index 344635c3..91e1b16d 100644
--- a/repo/ca-certificates/build
+++ b/repo/ca-certificates/build
@@ -7,7 +7,7 @@ sed -i mozilla/Makefile \
 patch -p1 -i update-ca-certificates-destdir.patch
 make
 
-cd "$pkg_dir" || return 1
+cd "$1" || return 1
 
 install -m0755 -d usr/share/ca-certificates
 install -m0755 -d usr/bin
@@ -16,7 +16,7 @@ install -m0755 -d etc/ssl/certs
 
 cd - || return 1
 
-make DESTDIR="$pkg_dir" install
+make DESTDIR="$1" install
 
-cd "$pkg_dir/usr/share/ca-certificates" || return 1
-find . -name '*.crt' | sort | cut -b3- > "$pkg_dir/etc/ca-certificates.conf"
+cd "$1/usr/share/ca-certificates" || return 1
+find . -name '*.crt' | sort | cut -b3- > "$1/etc/ca-certificates.conf"
diff --git a/repo/hummingbird/build b/repo/hummingbird/build
index 22406e3a..f216b96b 100755
--- a/repo/hummingbird/build
+++ b/repo/hummingbird/build
@@ -1,5 +1,5 @@
 make
-make DESTDIR="$pkg_dir" install
+make DESTDIR="$1" install
 
-install -Dm755 ./etc/rc.init "$pkg_dir/etc/rc.init"
-install -Dm755 ./etc/rc.shutdown "$pkg_dir/etc/rc.shutdown"
+install -Dm755 ./etc/rc.init "$1/etc/rc.init"
+install -Dm755 ./etc/rc.shutdown "$1/etc/rc.shutdown"
diff --git a/repo/m4/build b/repo/m4/build
index b33d8841..e2aa8ebd 100755
--- a/repo/m4/build
+++ b/repo/m4/build
@@ -4,4 +4,4 @@ patch -p1 -i fix-glibc-2.28.patch
     --prefix=/usr
 
 make
-make DESTDIR="$pkg_dir" install
+make DESTDIR="$1" install
diff --git a/repo/minibase/build b/repo/minibase/build
index 381d9113..898f6ec0 100755
--- a/repo/minibase/build
+++ b/repo/minibase/build
@@ -1,4 +1,4 @@
 ./configure
 
 make
-make DESTDIR="$pkg_dir" install
+make DESTDIR="$1" install
diff --git a/repo/openssl/build b/repo/openssl/build
index 763af950..04715c45 100644
--- a/repo/openssl/build
+++ b/repo/openssl/build
@@ -19,4 +19,4 @@
     -Wa,--noexecstack
 
 make
-make DESTDIR="$pkg_dir" install_sw
+make DESTDIR="$1" install_sw
diff --git a/repo/perl/build b/repo/perl/build
index d67284ed..d6d9b195 100755
--- a/repo/perl/build
+++ b/repo/perl/build
@@ -32,4 +32,4 @@ BUILD_BZIP2=0
     -Dusenm
 
 make
-make DESTDIR="$pkg_dir" install
+make DESTDIR="$1" install
diff --git a/repo/zlib/build b/repo/zlib/build
index 92cc458a..942afe63 100755
--- a/repo/zlib/build
+++ b/repo/zlib/build
@@ -4,4 +4,4 @@
     --shared
 
 make
-make DESTDIR="$pkg_dir" install
+make DESTDIR="$1" install