diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index bfe998f..f5105b5 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -131,7 +131,7 @@ if [ "$OPENJDK_LATEST" != "" ] ; then
 fi
 
 if [ "$WITH_TEMP" != "" ] ; then
-    pushd "$(mktemp --directory temp-generated-source-tarball-XXX)"
+    pushd "$(mktemp --directory --tmpdir temp-generated-source-tarball-XXX)"
 fi
 
 if [ "$VERSION" = "" ] ; then
@@ -287,7 +287,7 @@ mv "${TARBALL_NAME}" ..
 
 popd
 if [ "$WITH_TEMP" != "" ] ; then
-    echo "Tarball is: $(realpath --relative-to=.. .)/${TARBALL_NAME}"
+    echo "Tarball is: $(realpath .)/${TARBALL_NAME}"
     popd
 else
     echo -n "Done. You may want to remove the uncompressed version"
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 78909d0..2f60b86 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -2924,6 +2924,7 @@ cjc.mainProgram(args)
 - generate_source_tarball.sh: Adapt version logic to work with 8u
 - generate_source_tarball.sh: Add quoting for SCRIPT_DIR and JCONSOLE_PATCH (SC2086)
 - generate_source_tarball.sh: Update examples in header for clarity
+- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP
 - Sync patch set with portable build
 - Related: RHEL-30937