diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 2150bbf..575df62 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+
+# Copyright (C) 2024 Red Hat, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Generates the 'source tarball' for JDK projects.
 #
 # Example 1:
@@ -81,9 +97,17 @@ if [ "$OPENJDK_LATEST" != "" ] ; then
                           | tail --lines 1)
     PROJECT_NAME=openjdk
     REPO_NAME=jdk"${FEATURE_VERSION}"u
+    # Skip -ga tags since those are the same as the most recent non-ga tag, and
+    # the non-ga tag is the one that is used to generated the official source
+    # tarball.  For example:
+    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10-ga^{}
+    # 25a2e6c20c9a96853714284cabc6b456eb095070  refs/tags/jdk-17.0.10-ga
+    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10+7^{}
+    # e49c5749b10f3e90274b72e9279f794fdd191d27  refs/tags/jdk-17.0.10+7
     VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
                   "${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
                   "jdk-${FEATURE_VERSION}*" \
+                  | grep --invert-match '\-ga$' \
                   | head --lines 1 | cut --characters 52-)
     FILE_NAME_ROOT=open${VERSION}
     WITH_TEMP=1
@@ -178,62 +202,60 @@ echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
 echo -e "\tBOOT_JDK: ${BOOT_JDK}"
 
 if [ -d "${FILE_NAME_ROOT}" ] ; then
-  echo "exists exists exists exists exists exists exists "
-  echo "reusing reusing reusing reusing reusing reusing "
-  echo "${FILE_NAME_ROOT}"
-  STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
-  TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
+    echo "exists exists exists exists exists exists exists "
+    echo "reusing reusing reusing reusing reusing reusing "
+    echo "${FILE_NAME_ROOT}"
+    STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
+    TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
 else
-  mkdir "${FILE_NAME_ROOT}"
-  pushd "${FILE_NAME_ROOT}"
-    echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
-    git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}"
-    pushd "${VERSION}"
-      TAR_TIME="$(git log --max-count 1 --format=%cI)"
+    mkdir "${FILE_NAME_ROOT}"
+    pushd "${FILE_NAME_ROOT}"
+        echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+        git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}"
+        pushd "${VERSION}"
+            TAR_TIME="$(git log --max-count 1 --format=%cI)"
+        popd
     popd
-  popd
 fi
 pushd "${FILE_NAME_ROOT}"
-    EA_PART="$(git tag --contains "${VERSION}" \
-                   | grep --quiet '\-ga$' || echo '-ea')"
-
     # Generate .src-rev so build has knowledge of the revision the tarball was
     # created from
     mkdir build
     pushd build
-    sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
-    make store-source-revision
+        sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
+        make store-source-revision
     popd
     rm -rf build
 
-    # Remove commit checks
-    echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
-    find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
-
-    # Remove history and GHA
-    echo "find ${VERSION} -name '.hgtags'"
-    find ${VERSION} -name '.hgtags' -exec rm -fv '{}' '+'
-    echo "find ${VERSION} -name '.hgignore'"
-    find ${VERSION} -name '.hgignore' -exec rm -fv '{}' '+'
-    echo "find ${VERSION} -name '.gitattributes'"
-    find ${VERSION} -name '.gitattributes' -exec rm -fv '{}' '+'
-    echo "find ${VERSION} -name '.gitignore'"
-    find ${VERSION} -name '.gitignore' -exec rm -fv '{}' '+'
-    echo "find ${VERSION} -name '.git'"
-    find ${VERSION} -name '.git' -exec rm -rfv '{}' '+'
-    echo "find ${VERSION} -name '.github'"
-    find ${VERSION} -name '.github' -exec rm -rfv '{}' '+'
-
+    EA_PART="$(awk -F= \
+               '/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \
+               "${VERSION}"/make/conf/version-numbers.conf)"
+    TARBALL_BASE=${FILE_NAME_ROOT}${EA_PART}.tar
+    pushd "${VERSION}"
+        # Omit commit checks, history, and GHA from archive.
+        for skip in .jcheck .hgtags .hgignore .gitattributes .gitignore .github
+        do
+            echo "${skip}"" export-ignore" >> .git/info/attributes
+        done
+        # Do not bother with --mtime here; specify it to tar below.
+        # Unforunately, git-archive sorts added files like .src-rev at the end;
+        # retar below to use GNU tar --sort=name ordering which sorts .src-rev
+        # at the start.
+        git archive --output "${TARBALL_BASE}" --prefix="${VERSION}"/ \
+            --add-file=.src-rev --format=tar "${VERSION}"
+    popd
+    mv "${VERSION}" "${VERSION}".git
+    tar xf "${VERSION}".git/"${TARBALL_BASE}"
     echo "Compressing remaining forest"
     if [ "$COMPRESSION" = "xz" ] ; then
         SWITCH=cJf
     else
         SWITCH=czf
     fi
-    TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION}
+    TARBALL_NAME=${TARBALL_BASE}.${COMPRESSION}
     XZ_OPT=${XZ_OPT-"-T0"} \
           tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
-          --exclude-vcs -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
+          -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
     mv "${TARBALL_NAME}" ..
 popd
 if [ "$WITH_TEMP" != "" ] ; then
@@ -247,4 +269,6 @@ fi
 # Local Variables:
 # compile-command: "shellcheck generate_source_tarball.sh"
 # fill-column: 80
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
 # End: