diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 0f86f5f48..c80cbe914 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -276,7 +276,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
                 fi
@@ -288,7 +288,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
                 fi
diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml
index 5f8b434c5..65cc5c47b 100644
--- a/.github/workflows/Generate-PR.yml
+++ b/.github/workflows/Generate-PR.yml
@@ -266,7 +266,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
                 fi
@@ -278,7 +278,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
                 fi
@@ -387,6 +387,8 @@ jobs:
       - setup
       - update-package-files
     if: ${{ ( always() && !cancelled() ) && needs.setup.result == 'success' && ((( inputs.update_package_files ) && needs.update-package-files.result == 'success') || !( inputs.update_package_files )) }}
+    outputs:
+      current_head: ${{ steps.get-current-head.outputs.CURRENT_HEAD }}
     steps:
       - name: Fail if update or build jobs failed, otherwise create a PR
         if: ${{ contains(needs.*.result, 'failure') }}
@@ -436,14 +438,17 @@ jobs:
           git config user.email "${{ github.actor }}@users.noreply.github.com"
           git checkout master && git fetch origin master
           git checkout "${{ inputs.branch || github.ref_name }}"
-          # git rebase origin/master || git rebase --abort
           git log --no-merges --oneline -10
           git log --no-merges --oneline master..${{ inputs.branch || github.ref_name }} | grep -v "Merge branch 'master'\|Build Run on\|Package File Update Run on\|lint$" | tr '\n' '\0' | xargs -0 -n1 echo "- $*" >> /tmp/commits.txt
+      - name: Get Current HEAD hash
+        id: get-current-head
+        run: |
+          echo "CURRENT_HEAD=$(git ls-remote https://github.com/${{ github.repository }}.git | head -1 | sed 's/HEAD//')" >> "$GITHUB_OUTPUT"
       - name: Get changed files
         id: changed-files
         uses: tj-actions/changed-files@v47
         with:
-          base_sha: master
+          base_sha: ${{ steps.get-current-head.outputs.CURRENT_HEAD }}
           files_yaml: |
             manifest:
               - manifest/**
@@ -471,7 +476,13 @@ jobs:
           x86_64_PACKAGES: ${{ needs.setup.outputs.x86_64_packages }}
           armv7l_PACKAGES: ${{ needs.setup.outputs.armv7l_packages }}
         run: |
+          # Make untouched clone of repo so we can get the existing versions of packages.
+          (cd /tmp ; git clone --depth=1 https://github.com/${{ github.repository }}.git chromebrew_main )
           sudo gem install -N ptools --conservative
+          # Make crew do automatic gem installs before looking for deps.
+          LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew version
+          # Force creation of temporary device.json.
+          LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew deps zstd_static
           function join_by { local IFS="$1"; shift; echo "$*"; }
           rm -rf /tmp/pr.txt
           echo -e "## Description" >> /tmp/pr.txt
@@ -489,20 +500,23 @@ jobs:
             echo -e "### Packages with Updated versions or Changed package files:" >> /tmp/pr.txt
             for file in ${CHANGED_PACKAGES}
               do
-              pkg_version="$(LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -j "${file}" | jq -r '.[]|.version')"
-              upstream_version="$(LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -j "${file}" | jq -r '.[]|.upstream_version')"
+              # Get version before PR, but do not let a broken version stop us.
+              main_version_string="$(cd /tmp/chromebrew_main ; LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew version ${file} || true)"
+              [[ -n "$main_version_string" ]] && main_version_string=": $main_version_string"
+              pkg_version="$(LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew version ${file})"
+              upstream_version="$(LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -j "${file}" | jq -r '.[]|.upstream_version' || true)"
               if [[ -z "$pkg_version" ]]; then
-                echo "- ${file}" >> /tmp/pr.txt
-                PKG_DELTA+=( "${file}" )
+                echo "- \`${file}\`${main_version_string}" >> /tmp/pr.txt
+                PKG_DELTA+=( "${file}${main_version_string}" )
               elif [[ -z "$upstream_version" ]]; then
-                echo "- \`${file}\` → ${pkg_version}" >> /tmp/pr.txt
-                PKG_DELTA+=( "${file} → ${pkg_version}" )
+                echo "- \`${file}\`${main_version_string} → ${pkg_version}" >> /tmp/pr.txt
+                PKG_DELTA+=( "${file}${main_version_string} → ${pkg_version}" )
               elif [[ "$pkg_version" == "$upstream_version" ]]; then
-                echo "- \`${file}\` → ${pkg_version}" >> /tmp/pr.txt
-                PKG_DELTA+=( "${file} → ${pkg_version}" )
+                echo "- \`${file}\`${main_version_string} → ${pkg_version}" >> /tmp/pr.txt
+                PKG_DELTA+=( "${file}${main_version_string} → ${pkg_version}" )
               else
-                echo "- \`${file}\` → ${pkg_version} (current version is ${upstream_version})" >> /tmp/pr.txt
-                PKG_DELTA+=( "${file} → ${pkg_version}" )
+                echo "- \`${file}\`${main_version_string} → ${pkg_version} (current version is ${upstream_version})" >> /tmp/pr.txt
+                PKG_DELTA+=( "${file}${main_version_string} → ${pkg_version}" )
               fi
             done
             echo -e "##\nBuilds attempted for:" >> /tmp/pr.txt
@@ -521,7 +535,7 @@ jobs:
             echo -e "##\n- [x] This PR has no manifest .filelist changes. _(Package changes have neither added nor removed files.)_" >> /tmp/pr.txt
           fi
           echo -e "##\n### Run the following to get this pull request's changes locally for testing.\n\`\`\`bash" >> /tmp/pr.txt
-          echo -e "CREW_REPO=https://github.com/chromebrew/chromebrew.git CREW_BRANCH=${{ inputs.branch || github.ref_name }} crew update \\" >> /tmp/pr.txt
+          echo -e "CREW_REPO=https://github.com/${{ github.repository }}.git CREW_BRANCH=${{ inputs.branch || github.ref_name }} crew update \\" >> /tmp/pr.txt
           echo -e "&& yes | crew upgrade\n\`\`\`" >> /tmp/pr.txt
           [[ -n "${PKG_DELTA[*]}" ]] && PKG_DELTAS="— $(join_by , "${PKG_DELTA[@]}")"
           echo "PKG_DELTAS: $PKG_DELTAS"
diff --git a/.github/workflows/No-Compile-Needed.yml b/.github/workflows/No-Compile-Needed.yml
index cdc9c22d0..3ca25bd17 100644
--- a/.github/workflows/No-Compile-Needed.yml
+++ b/.github/workflows/No-Compile-Needed.yml
@@ -223,7 +223,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
                 fi
@@ -235,7 +235,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
                 fi
diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml
index 19a3a5dbd..064b6fd76 100644
--- a/.github/workflows/Unit-Test.yml
+++ b/.github/workflows/Unit-Test.yml
@@ -154,7 +154,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:nocturne-x86_64.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:hatch-x86_64.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:nocturne-x86_64.m90" >> "$GITHUB_ENV"
                 fi
@@ -166,7 +166,7 @@ jobs:
                 if [[ $GLIBC_232_COMPATIBLE_PACKAGES ]]; then
                     echo "CONTAINER=satmandu/crewbuild:fievel-armv7l.m97" >> "$GITHUB_ENV"
                 elif [[ $GLIBC_237_COMPATIBLE_PACKAGES ]]; then
-                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m141" >> "$GITHUB_ENV"
+                    echo "CONTAINER=satmandu/crewbuild:strongbad-armv7l.m142" >> "$GITHUB_ENV"
                 else
                     echo "CONTAINER=satmandu/crew-pre-glibc-standalone:fievel-armv7l.m91" >> "$GITHUB_ENV"
                 fi
diff --git a/.github/workflows/Updater-on-Demand.yml b/.github/workflows/Updater-on-Demand.yml
index 41feadef3..4879257f1 100644
--- a/.github/workflows/Updater-on-Demand.yml
+++ b/.github/workflows/Updater-on-Demand.yml
@@ -57,15 +57,19 @@ jobs:
           git pull
           git stash drop || true
           echo "pwd is $(pwd)"
+          # Make crew do automatic gem installs before looking for deps.
+          LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew version
+          # Force creation of temporary device.json.
+          LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew deps zstd_static
+          # Run Update Checks...
           LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -u -v "${{ inputs.version_cmd_input }}"
           for i in $(git status --porcelain | awk '{print $2}' | grep ^packages/)
           do
             git stash pop || true
             pkg=${i%.rb}
             pkg=${pkg#packages/}
-            LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -j ${pkg}
-            LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -j ${pkg} | jq -r '.[]|.version'
-            pkg_version="$(LD_LIBRARY_PATH=/usr/local/lib ruby tools/version.rb -j ${pkg} | jq -r '.[]|.version')"
+            # The updated package version will be the one in the package file.
+            pkg_version="$(LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew version ${pkg})"
             if [[ -z "$pkg_version" ]]; then
               branch_tag="$(date -u +%F-%H-%M)"
             else
diff --git a/manifest/armv7l/a/acpica.filelist b/manifest/armv7l/a/acpica.filelist
deleted file mode 100644
index e98341925..000000000
--- a/manifest/armv7l/a/acpica.filelist
+++ /dev/null
@@ -1,9 +0,0 @@
-# Total size: 797128
-/usr/local/bin/acpibin
-/usr/local/bin/acpidump
-/usr/local/bin/acpiexamples
-/usr/local/bin/acpiexec
-/usr/local/bin/acpihelp
-/usr/local/bin/acpisrc
-/usr/local/bin/acpixtract
-/usr/local/bin/iasl
diff --git a/manifest/i686/a/acpica.filelist b/manifest/i686/a/acpica.filelist
deleted file mode 100644
index 57714f34f..000000000
--- a/manifest/i686/a/acpica.filelist
+++ /dev/null
@@ -1,9 +0,0 @@
-# Total size: 792312
-/usr/local/bin/acpibin
-/usr/local/bin/acpidump
-/usr/local/bin/acpiexamples
-/usr/local/bin/acpiexec
-/usr/local/bin/acpihelp
-/usr/local/bin/acpisrc
-/usr/local/bin/acpixtract
-/usr/local/bin/iasl
diff --git a/manifest/x86_64/a/acpica.filelist b/manifest/x86_64/a/acpica.filelist
index 0a6477071..cbcc181a0 100644
--- a/manifest/x86_64/a/acpica.filelist
+++ b/manifest/x86_64/a/acpica.filelist
@@ -1,4 +1,4 @@
-# Total size: 801540
+# Total size: 2479224
 /usr/local/bin/acpibin
 /usr/local/bin/acpidump
 /usr/local/bin/acpiexamples
diff --git a/packages/acpica.rb b/packages/acpica.rb
index 94fde051c..a3fa8f8d7 100644
--- a/packages/acpica.rb
+++ b/packages/acpica.rb
@@ -3,18 +3,15 @@ require 'package'
 class Acpica < Package
   description 'ACPI tools, including Intel ACPI Source Language compiler'
   homepage 'https://www.intel.com/content/www/us/en/developer/topic-technology/open/acpica/overview.html'
-  version '20250404'
+  version '20250807'
   license 'GPL-2'
-  compatibility 'all'
+  compatibility 'x86_64'
   source_url 'https://github.com/acpica/acpica.git'
-  git_hashtag 'R2025_04_04'
+  git_hashtag version
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '3fcd388f8f8fba58e2aa3a15377b782bb2aa6412ba090bdf5b9da00fdae723e3',
-     armv7l: '3fcd388f8f8fba58e2aa3a15377b782bb2aa6412ba090bdf5b9da00fdae723e3',
-       i686: '0b01a7b5429b74a165642d83b8f7b06115182338c7483c47987c1ba318dd3332',
-     x86_64: '80c71c2cda3045d6c94b4fb298833b647001dc519c5f60e819bbb50b41a022a9'
+     x86_64: '2ed7312f5e2787c778c5157c16dadfa4aadb5afb88cfd0a44657318c5aaadf4d'
   })
 
   depends_on 'glibc' # R