diff --git a/overlay/bin/rpmbuild b/overlay/usr/local/bin/rpmbuild
similarity index 84%
rename from overlay/bin/rpmbuild
rename to overlay/usr/local/bin/rpmbuild
index a109704..7ecc6fe 100755
--- a/overlay/bin/rpmbuild
+++ b/overlay/usr/local/bin/rpmbuild
@@ -1,9 +1,9 @@
-#!/usr/bin/sh
+#!/usr/bin/env sh
 set -eo pipefail
 
 DIR=$(pwd)
 
-mkdir ./dist
+mkdir -p ./dist
 echo '%_topdir '"${DIR%/}"'/dist' > /root/.rpmmacros
 rpmdev-setuptree
 rsync -q -av "${DIR%/}/patch/" "${DIR%/}/dist/SOURCES"
diff --git a/overlay/bin/rpmbuild-official b/overlay/usr/local/bin/rpmbuild-official
similarity index 71%
rename from overlay/bin/rpmbuild-official
rename to overlay/usr/local/bin/rpmbuild-official
index 670fb98..e27b6bd 100755
--- a/overlay/bin/rpmbuild-official
+++ b/overlay/usr/local/bin/rpmbuild-official
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/usr/bin/env sh
 set -eo pipefail
 
 exec /usr/bin/rpmbuild "$@"