diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57a051d8dc..fca8abb2b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,11 +62,14 @@ variables:
 .build-rpm:
   extends: .build
   before_script:
+    # It might make sense to set "GIT_STRATEGY: none" and build from
+    # the tarball.
     - git config --global user.email "you@example.com"
     - git config --global user.name "Your Name"
     - mkdir build
     - cd build
     - perl ../tools/make-version.pl --set-release
+    - mv -v ../wireshark-*.tar.* .
   artifacts:
     paths:
       - build/packaging/rpm/RPMS
diff --git a/packaging/source/git-export-release.sh.in b/packaging/source/git-export-release.sh.in
index ce1b0ca897..310e30133e 100755
--- a/packaging/source/git-export-release.sh.in
+++ b/packaging/source/git-export-release.sh.in
@@ -19,7 +19,7 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set -e
+set -e -u -o pipefail
 
 DESTDIR=.
 
@@ -35,10 +35,15 @@ shift $(( OPTIND - 1 ))
 # or 3.4.5-67-gabcd4321
 # By default the version from make-version.pl + CMake is used.
 VERSION=@VERSION@
-if test -n "$1"; then
+if test -n "${1-}"; then
     VERSION="$1"
 fi
 
+if [ -f "${DESTDIR}/wireshark-$VERSION.tar.xz" ] ; then
+    echo "${DESTDIR}/wireshark-$VERSION.tar.xz exists."
+    exit 0
+fi
+
 STASH_POP=false
 XZ_OPTS=
 
@@ -49,7 +54,7 @@ if ! git diff-index --quiet HEAD ; then
     STASH_POP=true
 fi
 
-echo "Creating wireshark-$VERSION.tar.xz"
+echo "Creating ${DESTDIR}/wireshark-$VERSION.tar.xz"
 
 echo . | xz --threads=0 > /dev/null 2>&1 && XZ_OPTS=--threads=0