diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index d32c8d2..9d170c7 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -9,7 +9,7 @@
 # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
 # PROJECT_NAME=openjdk
 # REPO_NAME=jdk17u
-# VERSION=jdk-17.0.3+5
+# VERSION=jdk-17.0.7+7
 # or to eg prepare systemtap:
 # icedtea7's jstack and other tapsets
 # VERSION=6327cf1cea9e
@@ -182,21 +182,21 @@ pushd "${FILE_NAME_ROOT}"
 
     # Remove commit checks
     echo "Removing $(find openjdk -name '.jcheck' -print)"
-    find openjdk -name '.jcheck' -print0 | xargs -0 rm -r
+    find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
 
     # Remove history and GHA
     echo "find openjdk -name '.hgtags'"
-    find openjdk -name '.hgtags' -exec rm -v '{}' '+'
+    find openjdk -name '.hgtags' -exec rm -vf '{}' '+'
     echo "find openjdk -name '.hgignore'"
-    find openjdk -name '.hgignore' -exec rm -v '{}' '+'
+    find openjdk -name '.hgignore' -exec rm -vf '{}' '+'
     echo "find openjdk -name '.gitattributes'"
-    find openjdk -name '.gitattributes' -exec rm -v '{}' '+'
+    find openjdk -name '.gitattributes' -exec rm -vf '{}' '+'
     echo "find openjdk -name '.gitignore'"
-    find openjdk -name '.gitignore' -exec rm -v '{}' '+'
+    find openjdk -name '.gitignore' -exec rm -vf '{}' '+'
     echo "find openjdk -name '.git'"
-    find openjdk -name '.git' -exec rm -rv '{}' '+'
+    find openjdk -name '.git' -exec rm -rvf '{}' '+'
     echo "find openjdk -name '.github'"
-    find openjdk -name '.github' -exec rm -rv '{}' '+'
+    find openjdk -name '.github' -exec rm -rvf '{}' '+'
 
     echo "Compressing remaining forest"
     if [ "X$COMPRESSION" = "Xxz" ] ; then
@@ -204,7 +204,8 @@ pushd "${FILE_NAME_ROOT}"
     else
         SWITCH=czf
     fi
-    tar --exclude-vcs -$SWITCH ${FILE_NAME_ROOT}.tar.${COMPRESSION} $TO_COMPRESS
-    mv ${FILE_NAME_ROOT}.tar.${COMPRESSION}  ..
+    TARBALL_NAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
+    tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
+    mv ${TARBALL_NAME} ..
 popd
 echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."