diff --git a/packaging/flatpak/net.catcrafts.CrafterBuild.yaml b/packaging/flatpak/net.catcrafts.CrafterBuild.yaml
index 7eb8644..3584063 100644
--- a/packaging/flatpak/net.catcrafts.CrafterBuild.yaml
+++ b/packaging/flatpak/net.catcrafts.CrafterBuild.yaml
@@ -113,7 +113,7 @@ modules:
     # wasi-sdk's sysroot-only mode, driven by the clang built above:
     # wasi-libc, compiler-rt builtins (installed into our clang's resource
     # dir, where the wasm32 driver looks for them) and libc++ for wasip1 and
-    # wasip1-threads. The llvm-project tree is the same tarball as above so
+    # wasip1-threads. The llvm-project tree is the same release as above so
     # the wasm libc++ matches the native one.
     buildsystem: cmake-ninja
     builddir: true
@@ -154,22 +154,20 @@ modules:
         url: https://github.com/WebAssembly/wasi-libc.git
         commit: 2e6fb9d8ee0cdf9e431fbcabe8af3115de000a13
         dest: src/wasi-libc
-      - type: archive
-        url: https://github.com/llvm/llvm-project/releases/download/llvmorg-23.1.2/llvm-project-23.1.2.src.tar.xz
-        sha256: c98bbef08a2b4c2613cd50e9aa9ae7b69b1fe6c16b2c40373bc0ab6116fdf78a
-        dest: src/llvm-project
-      # wasi-sdk patches its LLVM tree before building libc++ (`git apply` in
-      # src/llvm-project), and upstream that directory is a submodule, a
-      # repository of its own. Unpacked from a tarball it is a plain
+      # A git checkout, where the llvm module above unpacks the release
+      # tarball of the same tag: wasi-sdk treats src/llvm-project as the
+      # submodule it is upstream. It patches the tree with `git apply` before
+      # building libc++, and records `git rev-parse HEAD` in the sysroot's
+      # VERSION file. Unpacked from a tarball the directory is a plain
       # subdirectory of the wasi-sdk checkout, where git treats the patched
       # paths as outside the current directory, skips every one of them and
       # exits 0. LLVM 22 happened to build without the patches; LLVM 23's
-      # libc++ does not compile for WASI without one of them. Making the tree
-      # a repository lets wasi-sdk's own patch step do what it does upstream,
-      # with whatever patch list the pinned tag carries.
-      - type: shell
-        commands:
-          - git init -q src/llvm-project
+      # libc++ does not compile for WASI without one of them.
+      - type: git
+        url: https://github.com/llvm/llvm-project.git
+        tag: llvmorg-23.1.2
+        commit: 85ac560262434c9ccfc0c183ec22d4138ed647fb
+        dest: src/llvm-project
       - type: file
         path: wasi-host-toolchain.cmake