diff --git a/.SRCINFO b/.SRCINFO
index 57ffc0de57816..c38d2b7bfb9a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -62,7 +62,7 @@ pkgbase = icecat
 	options = !lto
 	options = !makeflags
 	options = !strip
-	source = gnuzilla-7286181cbff5c4b98ed9246366a85ae1fbc8f54d.tar.gz::https://cgit.git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-7286181cbff5c4b98ed9246366a85ae1fbc8f54d.tar.gz
+	source = gnuzilla-128.12.0-7286181.tar.gz::https://cgit.git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-7286181cbff5c4b98ed9246366a85ae1fbc8f54d.tar.gz
 	source = https://archive.mozilla.org/pub/firefox/releases/128.12.0esr/source/firefox-128.12.0esr.source.tar.xz
 	sha256sums = 1f6d7577828c0c2eedcb4d761b6b7e7fbaa8d300f1ef866a761247991ee8a622
 	sha256sums = 2bedeb86c6cb16cd3fce88d42ae4e245bafe2c6e9221ba8e445b8e02e89d973f
diff --git a/PKGBUILD b/PKGBUILD
index a4dc9fa17118e..9141df802be6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -140,7 +140,7 @@ _source_icecat() {
   _pkgsrc_firefox="firefox-$pkgver"
   _pkgext="tar.gz"
   source=(
-    "$_pkgsrc_gnuzilla.$_pkgext"::"https://cgit.git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-$_commit.$_pkgext"
+    "gnuzilla-$pkgver-${_commit::7}.$_pkgext"::"https://cgit.git.savannah.gnu.org/cgit/gnuzilla.git/snapshot/gnuzilla-$_commit.$_pkgext"
     "https://archive.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz"
   )
   sha256sums=(
@@ -239,8 +239,7 @@ _make_icecat() {
   # save icecat tarball
   if [[ "${_build_save_source::1}" == "t" ]]; then
     echo "Saving patched sources..."
-    rm -rf "$SRCDEST/$_pkgsrc.tar.zst"
-    mv "$_pkgsrc_gnuzilla/output/$_pkgsrc" "$srcdir/"
+    mv -f "$_pkgsrc_gnuzilla/output/$_pkgsrc" "$srcdir/"
     bsdtar -a -cf "$_pkgsrc.tar.zst" --options zstd:compression-level=9 "$_pkgsrc"
     cp -rf "$_pkgsrc.tar.zst" "$SRCDEST/"
   fi
@@ -414,7 +413,7 @@ build() (
     # find previous profile file...
     local _old_profdata _old_jarlog _pkgver_old tmp_old tmp_new
     _pkgver_prof=$(
-      cd "${SRCDEST:-$startdir}"
+      cd "$SRCDEST"
       for i in *.profdata; do [ -f "$i" ] && echo "$i"; done \
         | sort -rV | head -1 | sed -E -e 's&^[^0-9]+-([0-9\.]+)-merged.profdata&\1&'
     )
@@ -434,8 +433,8 @@ build() (
       _pkgver_prof="$pkgver"
     fi
 
-    local _old_profdata="${SRCDEST:-$startdir}/$_pkgname-$_pkgver_prof-merged.profdata"
-    local _old_jarlog="${SRCDEST:-$startdir}/$_pkgname-$_pkgver_prof-jarlog"
+    local _old_profdata="$SRCDEST/$_pkgname-$_pkgver_prof-merged.profdata"
+    local _old_jarlog="$SRCDEST/$_pkgname-$_pkgver_prof-jarlog"
 
     # Restore old profile
     if [[ "${_build_pgo_reuse::1}" == "t" ]]; then