diff --git a/src/zpkg b/src/zpkg
index 6964ef0..5aad327 100755
--- a/src/zpkg
+++ b/src/zpkg
@@ -48,9 +48,9 @@ package ()
   cd "$1"
   if [ -n "$(command -v pv)" ]
   then
-    tar cf - * -P | pv -s "$(du -sb . | awk '{print $1}')" | xz > "$2"
+    tar -cf - --owner=0 --group=0 -P * | pv -s "$(du -sb . | awk '{print $1}')" | xz > "$2"
   else
-    tar -cvJf "$2" *
+    tar -cvJf "$2" --owner=0 --group=0 *
   fi
   )
   mv "$1/$2" ./
@@ -77,7 +77,7 @@ deploy_folder ()
 deploy_package ()
 {
   echo "Deploying $1: $(du -sh "$1" | awk '{print $1}')iB"
-  scp "$1" $SSH_ADDRESS:~/"$(grep 'PKG_PATH=' .config | cut -d'=' -f2-)"
+  scp "$1" $SSH_ADDRESS:~/'$(grep "PKG_PATH=" .config | cut -d"=" -f2-)'
 }
 
 fetch_package ()