diff --git a/package-static.bash b/package-static.bash
index a30d649..f2dc0d7 100755
--- a/package-static.bash
+++ b/package-static.bash
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-cd $(dirname "$0")
+cd "$(dirname "$0")"
 
 # Compiles the gocryptfs binary and sets $GITVERSION
 source build-without-openssl.bash
@@ -19,7 +19,7 @@ OS=$(go env GOOS)
 
 TARGZ=gocryptfs_${GITVERSION}_${OS}-static_${ARCH}.tar.gz
 
-tar czf $TARGZ gocryptfs gocryptfs.1
+tar --owner=root --group=root -czf $TARGZ gocryptfs gocryptfs.1
 
 echo "Tar created."
 echo "Hint for signing: gpg -u 23A02740 --armor --detach-sig $TARGZ"
diff --git a/package.bash b/package.bash
index fe01709..469a17b 100755
--- a/package.bash
+++ b/package.bash
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/bin/bash -eu
 
-set -eu
-cd $(dirname "$0")
+cd "$(dirname "$0")"
 
 # Build binary and sets $GITVERSION (example: v0.7-15-gf01f599)
 source build.bash
@@ -28,7 +27,7 @@ cp -a ./Documentation/gocryptfs.1 .
 
 TARGZ=gocryptfs_${GITVERSION}_${ID}${VERSION_ID}_${ARCH}.tar.gz
 
-tar czf $TARGZ gocryptfs gocryptfs.1
+tar --owner=root --group=root -czf $TARGZ gocryptfs gocryptfs.1
 
 echo "Tar created."
 echo "Hint for signing: gpg -u 23A02740 --armor --detach-sig $TARGZ"