diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 531785e..ac319b0 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -118,7 +118,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
@@ -266,7 +266,7 @@ pushd "${FILE_NAME_ROOT}"
     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-21-openjdk.spec b/java-21-openjdk.spec
index 84857de..6fdd4ff 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -2537,6 +2537,7 @@ cjc.mainProgram(args)
 - Install alt-java man page from the misc tarball as it is no longer in the JDK image
 - generate_source_tarball.sh: Update examples in header for clarity
 - generate_source_tarball.sh: Cleanup message issued when checkout already exists
+- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP
 - Related: RHEL-30946
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.1.ea