diff --git a/app/update-packaging/make_incremental_update.sh b/app/update-packaging/make_incremental_update.sh
index cb003b860d..535ad9d736 100755
--- a/app/update-packaging/make_incremental_update.sh
+++ b/app/update-packaging/make_incremental_update.sh
@@ -173,7 +173,7 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do
 
     if check_for_add_if_not_update "$f"; then
       # The full workdir may not exist yet, so create it if necessary.
-      mkdir -p `dirname "$workdir/$f"`
+      mkdir -p "$(dirname "$workdir/$f")"
       $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f"
       copy_perm "$newdir/$f" "$workdir/$f"
       make_add_if_not_instruction "$f" "$updatemanifestv3"
@@ -183,7 +183,7 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do
 
     if check_for_forced_update "$requested_forced_updates" "$f"; then
       # The full workdir may not exist yet, so create it if necessary.
-      mkdir -p `dirname "$workdir/$f"`
+      mkdir -p "$(dirname "$workdir/$f")"
       $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f"
       copy_perm "$newdir/$f" "$workdir/$f"
       make_add_instruction "$f" "$updatemanifestv3" 1
diff --git a/app/update-packaging/xz_to_bzip b/app/update-packaging/xz_to_bzip
index e10c094a61..d4593f9ce7 100755
--- a/app/update-packaging/xz_to_bzip
+++ b/app/update-packaging/xz_to_bzip
@@ -61,6 +61,6 @@ echo "MAR channel name: $channel"
 echo "Product version: $version"
 
 echo "Creating new MAR"
-$mar -V $version -H $channel -c "$outfile" `find . -type f | sed -E 's/^\.\/(.+)/"\1"/'
+find . -type f -print0 | xargs -0 $mar -V $version -H $channel -c "$outfile"
 echo
 $mar -T "$outfile"