diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2bae58..971260b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,9 +25,24 @@ env:
   HAVE_CLEANUP_PAT: ${{ secrets.CLEANUP_PAT != '' }}
 
 jobs:
+  pre_check:
+    name: Pre Checks
+    if: ${{ github.event.inputs.buildOnly != 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repo Check
+        run: |
+          if [[ "$GITHUB_REPOSITORY" != "BtbN/FFmpeg-Builds" ]]; then
+            echo "When forking this repository to make your own builds, you have to adjust this check."
+            echo "When doing so make sure to randomize the scheduled cron time above, in order to spread out the various build times as much as possible."
+            echo "This has been put in place due to the enormous amounts of traffic hundreds/thousands of parallel builds can cause on external infrastructure."
+            exit 1
+          fi
+          exit 0
   build_base:
     name: Build base image
     if: ${{ github.event.inputs.buildOnly != 'true' }}
+    needs: pre_check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -46,8 +61,11 @@ jobs:
         id: imagename
         run: |
           IMG="${GITHUB_REPOSITORY,,}/base"
+          DLIMG="${GITHUB_REPOSITORY,,}/dl_cache"
           echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
           echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
+          echo "dlname=ghcr.io/${DLIMG/ /-}" >> $GITHUB_OUTPUT
+          echo "dlrawname=${DLIMG/ /-}" >> $GITHUB_OUTPUT
       - name: Stop Commands
         run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
       - name: Build target base image
@@ -59,6 +77,22 @@ jobs:
           tags: ${{ steps.imagename.outputs.name }}:latest
           cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
           cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
+      - name: Generate download cache Dockerfile
+        id: dl_cache
+        run: |
+          ./generate.sh dl only
+          echo "dltagname=$(./util/get_dl_cache_tag.sh)" >> $GITHUB_OUTPUT
+          cat Dockerfile.dl
+      - name: Build download cache image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: Dockerfile.dl
+          pull: true
+          push: true
+          tags: ${{ steps.imagename.outputs.dlname }}:${{ steps.dl_cache.outputs.dltagname }}
+          cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.dlname }}:cache
+          cache-from: type=registry,ref=${{ steps.imagename.outputs.dlname }}:cache
       - name: Cleanup
         if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
         continue-on-error: true
@@ -70,6 +104,18 @@ jobs:
           repository: ${{ github.repository }}
           owner_type: user
           untagged_only: true
+      - name: Cleanup Download Cache
+        if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
+        continue-on-error: true
+        uses: BtbN/delete-untagged-ghcr-action@main
+        with:
+          token: ${{ secrets.CLEANUP_PAT }}
+          package_name: ${{ steps.imagename.outputs.dlrawname }}
+          repository_owner: ${{ github.repository_owner }}
+          repository: ${{ github.repository }}
+          owner_type: user
+          untagged_only: false
+          keep_latest: 20
   build_target_bases:
     name: Build target base image
     if: ${{ github.event.inputs.buildOnly != 'true' }}
@@ -98,6 +144,7 @@ jobs:
           IMG="${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}"
           echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
           echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
+          echo "gh_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
       - name: Stop Commands
         run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
       - name: Build target base image
@@ -109,6 +156,8 @@ jobs:
           tags: ${{ steps.imagename.outputs.name }}:latest
           cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
           cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
+          build-args: |
+            GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
       - name: Cleanup
         if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
         continue-on-error: true
@@ -151,7 +200,6 @@ jobs:
           IMG="${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
           echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
           echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
-          echo "gh_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
       - name: Stop Commands
         run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
       - name: Build target base image
@@ -163,8 +211,6 @@ jobs:
           tags: ${{ steps.imagename.outputs.name }}:latest
           cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
           cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
-          build-args: |
-            GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
       - name: Cleanup
         if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
         continue-on-error: true
diff --git a/.gitignore b/.gitignore
index 1c27a7e..107f214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/Dockerfile
+/Dockerfile*
 /ffbuild/
 /artifacts/
 /.cache/
diff --git a/build.sh b/build.sh
index 80ec56a..532535a 100755
--- a/build.sh
+++ b/build.sh
@@ -90,10 +90,10 @@ package_variant ffbuild/prefix "ffbuild/pkgroot/$BUILD_NAME"
 cd ffbuild/pkgroot
 if [[ "${TARGET}" == win* ]]; then
     OUTPUT_FNAME="${BUILD_NAME}.zip"
-    zip -9 -r "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME"
+    docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "${ARTIFACTS_PATH}":/out -v "${PWD}/${BUILD_NAME}":"/${BUILD_NAME}" -w / "$IMAGE" zip -9 -r "/out/${OUTPUT_FNAME}" "$BUILD_NAME"
 else
     OUTPUT_FNAME="${BUILD_NAME}.tar.xz"
-    tar cJf "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME"
+    docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "${ARTIFACTS_PATH}":/out -v "${PWD}/${BUILD_NAME}":"/${BUILD_NAME}" -w / "$IMAGE" tar cJf "/out/${OUTPUT_FNAME}" "$BUILD_NAME"
 fi
 cd -
 
diff --git a/generate.sh b/generate.sh
index 29d505d..c9fda9b 100755
--- a/generate.sh
+++ b/generate.sh
@@ -3,29 +3,83 @@ set -e
 cd "$(dirname "$0")"
 source util/vars.sh
 
-rm -f Dockerfile
+export LC_ALL=C.UTF-8
+
+rm -f Dockerfile Dockerfile.{dl,final,dl.final}
 
 layername() {
     printf "layer-"
     basename "$1" | sed 's/.sh$//'
 }
 
-exec_dockerstage() {
-    SCRIPT="$1"
-    (
-        SELF="$SCRIPT"
-        source "$SCRIPT"
-        ffbuild_enabled || exit 0
-        ffbuild_dockerstage || exit $?
-    )
-}
-
 to_df() {
     _of="${TODF:-Dockerfile}"
     printf "$@" >> "$_of"
     echo >> "$_of"
 }
 
+default_dl() {
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO\" \"$SCRIPT_COMMIT\" \"$1\""
+}
+
+###
+### Generate download Dockerfile
+###
+
+exec_dockerstage_dl() {
+    SCRIPT="$1"
+    (
+        SELF="$SCRIPT"
+        SELFLAYER="$(layername "$STAGE")"
+        source "$SCRIPT"
+        ffbuild_dockerdl || exit $?
+        TODF="Dockerfile.dl.final" ffbuild_dockerlayer_dl || exit $?
+    )
+}
+
+export TODF="Dockerfile.dl"
+
+to_df "FROM ${REGISTRY}/${REPO}/base:latest AS base"
+to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
+to_df "WORKDIR \$FFBUILD_DLDIR"
+
+for STAGE in scripts.d/*.sh scripts.d/*/*.sh; do
+    to_df "FROM base AS $(layername "$STAGE")"
+    exec_dockerstage_dl "$STAGE"
+done
+
+to_df "FROM base AS intermediate"
+cat Dockerfile.dl.final >> "$TODF"
+rm Dockerfile.dl.final
+
+to_df "FROM scratch"
+to_df "COPY --from=intermediate /opt/ffdl/. /"
+
+if [[ "$TARGET" == "dl" && "$VARIANT" == "only" ]]; then
+    exit 0
+fi
+
+DL_IMAGE="${DL_IMAGE_RAW}:$(./util/get_dl_cache_tag.sh)"
+
+###
+### Generate main Dockerfile
+###
+
+exec_dockerstage() {
+    SCRIPT="$1"
+    (
+        SELF="$SCRIPT"
+        source "$SCRIPT"
+
+        ffbuild_enabled || exit 0
+
+        to_df "ENV SELF=\"$SELF\""
+        ffbuild_dockerstage || exit $?
+    )
+}
+
+export TODF="Dockerfile"
+
 to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest AS base"
 to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
 
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index df45b9a..dc1039b 100644
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -269,6 +269,8 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_LOCAL_BUNDLED is not set
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_3 is not set
+# CT_LINUX_V_6_2 is not set
 # CT_LINUX_V_6_1 is not set
 # CT_LINUX_V_6_0 is not set
 # CT_LINUX_V_5_19 is not set
@@ -475,6 +477,8 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_2_37_or_older=y
+CT_GLIBC_older_than_2_37=y
 CT_GLIBC_2_36_or_older=y
 CT_GLIBC_older_than_2_36=y
 CT_GLIBC_2_34_or_older=y
@@ -579,7 +583,8 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@@ -588,12 +593,14 @@ CT_GCC_V_12=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@@ -766,7 +773,8 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_25=y
+CT_ISL_V_0_26=y
+# CT_ISL_V_0_25 is not set
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -778,7 +786,7 @@ CT_ISL_V_0_25=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 # CT_ISL_V_0_11 is not set
-CT_ISL_VERSION="0.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -875,10 +883,11 @@ CT_NCURSES_PATCH_GLOBAL=y
 # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
 # CT_NCURSES_PATCH_NONE is not set
 CT_NCURSES_PATCH_ORDER="global"
-CT_NCURSES_V_6_2=y
+CT_NCURSES_V_6_4=y
+# CT_NCURSES_V_6_2 is not set
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.2"
+CT_NCURSES_VERSION="6.4"
 CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
 CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -927,8 +936,9 @@ CT_ZSTD_PATCH_GLOBAL=y
 # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
 # CT_ZSTD_PATCH_NONE is not set
 CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_2=y
-CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_V_1_5_5=y
+# CT_ZSTD_V_1_5_2 is not set
+CT_ZSTD_VERSION="1.5.5"
 CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
 CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
index a070e17..1ab09e8 100644
--- a/images/base-linuxarm64/ct-ng-config
+++ b/images/base-linuxarm64/ct-ng-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -276,6 +276,8 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_LOCAL_BUNDLED is not set
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_3 is not set
+# CT_LINUX_V_6_2 is not set
 # CT_LINUX_V_6_1 is not set
 # CT_LINUX_V_6_0 is not set
 # CT_LINUX_V_5_19 is not set
@@ -481,6 +483,8 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
+CT_GLIBC_2_37_or_older=y
+CT_GLIBC_older_than_2_37=y
 CT_GLIBC_2_36_or_older=y
 CT_GLIBC_older_than_2_36=y
 CT_GLIBC_2_34_or_older=y
@@ -591,7 +595,8 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@@ -600,12 +605,14 @@ CT_GCC_V_12=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@@ -778,7 +785,8 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_25=y
+CT_ISL_V_0_26=y
+# CT_ISL_V_0_25 is not set
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -790,7 +798,7 @@ CT_ISL_V_0_25=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 # CT_ISL_V_0_11 is not set
-CT_ISL_VERSION="0.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -887,10 +895,11 @@ CT_NCURSES_PATCH_GLOBAL=y
 # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
 # CT_NCURSES_PATCH_NONE is not set
 CT_NCURSES_PATCH_ORDER="global"
-CT_NCURSES_V_6_2=y
+CT_NCURSES_V_6_4=y
+# CT_NCURSES_V_6_2 is not set
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.2"
+CT_NCURSES_VERSION="6.4"
 CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
 CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -939,8 +948,9 @@ CT_ZSTD_PATCH_GLOBAL=y
 # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
 # CT_ZSTD_PATCH_NONE is not set
 CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_2=y
-CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_V_1_5_5=y
+# CT_ZSTD_V_1_5_2 is not set
+CT_ZSTD_VERSION="1.5.5"
 CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
 CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-win32/cross.meson b/images/base-win32/cross.meson
index a52a835..c2a0ad1 100644
--- a/images/base-win32/cross.meson
+++ b/images/base-win32/cross.meson
@@ -5,6 +5,7 @@ ar = 'i686-w64-mingw32-gcc-ar'
 ranlib = 'i686-w64-mingw32-gcc-ranlib'
 strip = 'i686-w64-mingw32-strip'
 windres = 'i686-w64-mingw32-windres'
+dlltool = 'i686-w64-mingw32-dlltool'
 exe_wrapper = ['wine']
 
 [properties]
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 97bdafd..96759e1 100644
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -175,6 +175,7 @@ CT_ARCH_SUFFIX=""
 # CT_MULTILIB is not set
 CT_DEMULTILIB=y
 CT_ARCH_USE_MMU=y
+CT_ARCH_SUPPORTS_LIBSANITIZER=y
 CT_ARCH_SUPPORTS_32=y
 CT_ARCH_SUPPORTS_64=y
 CT_ARCH_DEFAULT_32=y
@@ -381,6 +382,10 @@ CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_MINGW_W64_ARCHIVE_FORMATS=".tar.bz2 .zip"
 CT_MINGW_W64_SIGNATURE_FORMAT="packed/.sig"
 CT_MINGW_SECURE_API=y
+# CT_MINGW_DEFAULT_MSVCRT_DEFAULT is not set
+# CT_MINGW_DEFAULT_MSVCRT_MSVCRT is not set
+CT_MINGW_DEFAULT_MSVCRT_UCRT=y
+# CT_MINGW_DEFAULT_MSVCRT_CUSTOM is not set
 CT_MINGW_DIRECTX=y
 CT_MINGW_DDK=y
 CT_MINGW_TOOLS=y
@@ -436,7 +441,8 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@@ -445,12 +451,14 @@ CT_GCC_V_12=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@@ -620,7 +628,8 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_25=y
+CT_ISL_V_0_26=y
+# CT_ISL_V_0_25 is not set
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -631,7 +640,7 @@ CT_ISL_V_0_25=y
 # CT_ISL_V_0_17 is not set
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -729,8 +738,9 @@ CT_ZSTD_PATCH_GLOBAL=y
 # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
 # CT_ZSTD_PATCH_NONE is not set
 CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_2=y
-CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_V_1_5_5=y
+# CT_ZSTD_V_1_5_2 is not set
+CT_ZSTD_VERSION="1.5.5"
 CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
 CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-win64/cross.meson b/images/base-win64/cross.meson
index eb16efb..0b5513c 100644
--- a/images/base-win64/cross.meson
+++ b/images/base-win64/cross.meson
@@ -5,6 +5,7 @@ ar = 'x86_64-w64-mingw32-gcc-ar'
 ranlib = 'x86_64-w64-mingw32-gcc-ranlib'
 strip = 'x86_64-w64-mingw32-strip'
 windres = 'x86_64-w64-mingw32-windres'
+dlltool = 'x86_64-w64-mingw32-dlltool'
 exe_wrapper = ['wine']
 
 [properties]
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 90c00bf..340cccd 100644
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -382,6 +382,10 @@ CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_MINGW_W64_ARCHIVE_FORMATS=".tar.bz2 .zip"
 CT_MINGW_W64_SIGNATURE_FORMAT="packed/.sig"
 CT_MINGW_SECURE_API=y
+# CT_MINGW_DEFAULT_MSVCRT_DEFAULT is not set
+# CT_MINGW_DEFAULT_MSVCRT_MSVCRT is not set
+CT_MINGW_DEFAULT_MSVCRT_UCRT=y
+# CT_MINGW_DEFAULT_MSVCRT_CUSTOM is not set
 CT_MINGW_DIRECTX=y
 CT_MINGW_DDK=y
 CT_MINGW_TOOLS=y
@@ -437,7 +441,8 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@@ -446,12 +451,14 @@ CT_GCC_V_12=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@@ -621,7 +628,8 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_25=y
+CT_ISL_V_0_26=y
+# CT_ISL_V_0_25 is not set
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -632,7 +640,7 @@ CT_ISL_V_0_25=y
 # CT_ISL_V_0_17 is not set
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -730,8 +738,9 @@ CT_ZSTD_PATCH_GLOBAL=y
 # CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
 # CT_ZSTD_PATCH_NONE is not set
 CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_2=y
-CT_ZSTD_VERSION="1.5.2"
+CT_ZSTD_V_1_5_5=y
+# CT_ZSTD_V_1_5_2 is not set
+CT_ZSTD_VERSION="1.5.5"
 CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
 CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 17dead2..9725cf4 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -1,11 +1,14 @@
 FROM ubuntu:23.04
 
+ENV FFBUILD_DLDIR="/opt/ffdl"
+
 ENV DEBIAN_FRONTEND noninteractive
 RUN \
+    mkdir -p "$FFBUILD_DLDIR" && \
     apt-get -y update && \
     apt-get -y dist-upgrade && \
     apt-get -y install build-essential yasm nasm \
-        xxd pkgconf curl wget unzip git subversion mercurial \
+        xxd pkgconf curl wget unzip zip git subversion mercurial \
         autoconf automake libtool libtool-bin autopoint gettext cmake clang meson ninja-build \
         texinfo texi2html help2man flex bison groff \
         gperf itstool ragel libc6-dev libssl-dev \
diff --git a/images/base/run_stage.sh b/images/base/run_stage.sh
index 6db0e8d..baf52b1 100755
--- a/images/base/run_stage.sh
+++ b/images/base/run_stage.sh
@@ -11,5 +11,12 @@ export RAW_LDFLAGS="$LDFLAGS"
 mkdir -p /stage
 source "$1"
 cd /stage
-ffbuild_dockerbuild
+if [[ -n "$3" ]]; then
+    cd "$3"
+fi
+if [[ -z "$2" ]]; then
+    ffbuild_dockerbuild
+else
+    "$2"
+fi
 rm -rf /stage "$FFBUILD_PREFIX"/bin
diff --git a/makeimage.sh b/makeimage.sh
index bbbd4cd..2e63a43 100755
--- a/makeimage.sh
+++ b/makeimage.sh
@@ -18,13 +18,14 @@ docker buildx inspect ffbuilder &>/dev/null || docker buildx create \
     --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 \
     --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1
 
-if [[ -z "$QUICKBUILD" ]]; then
-    docker container inspect ffbuildreg &>/dev/null || \
-        docker run --rm -d -p 127.0.0.1:0:5000 --name ffbuildreg registry:2
-    LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
-    LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
-    trap "rm -f '$TMPCFG'; docker container stop ffbuildreg" EXIT
+docker container inspect ffbuildreg &>/dev/null || \
+    docker run --rm -d -p 127.0.0.1:64647:5000 --name ffbuildreg registry:2
+LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
+LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
 
+export REGISTRY_OVERRIDE_DL="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY_DL="local"
+
+if [[ -z "$QUICKBUILD" ]]; then
     if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
         docker buildx --builder ffbuilder build \
             --cache-from=type=local,src=.cache/"${BASE_IMAGE/:/_}" \
@@ -38,14 +39,29 @@ if [[ -z "$QUICKBUILD" ]]; then
         --push --tag "${LOCAL_ROOT}/base-${TARGET}:latest" \
         --build-arg GH_REPO="$LOCAL_ROOT" "images/base-${TARGET}"
 
-    export REGISTRY_OVERRIDE="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY="local"
+    export REGISTRY_OVERRIDE="$REGISTRY_OVERRIDE_DL" GITHUB_REPOSITORY="$GITHUB_REPOSITORY_DL"
 fi
 
 ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
+DL_CACHE_TAG="$(./util/get_dl_cache_tag.sh)"
+DL_IMAGE="${DL_IMAGE_RAW}:${DL_CACHE_TAG}"
+
+if docker pull "${DL_IMAGE}"; then
+    export REGISTRY_OVERRIDE_DL="$REGISTRY" GITHUB_REPOSITORY_DL="$REPO"
+    ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
+else
+    DL_IMAGE="${LOCAL_ROOT}/dl_cache:${DL_CACHE_TAG}"
+    docker manifest inspect --insecure "${DL_IMAGE}" >/dev/null ||
+        docker buildx --builder ffbuilder build -f Dockerfile.dl \
+            --cache-from=type=local,src=.cache/dl_image_cache \
+            --cache-to=type=local,mode=max,dest=.cache/dl_image_cache \
+            --push --tag "${DL_IMAGE}" .
+fi
 
 docker buildx --builder ffbuilder build \
     --cache-from=type=local,src=.cache/"${IMAGE/:/_}" \
     --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \
     --load --tag "$IMAGE" .
 
+docker container stop ffbuildreg
 docker buildx rm -f ffbuilder
diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh
index ad55011..d1ced26 100755
--- a/scripts.d/10-mingw-std-threads.sh
+++ b/scripts.d/10-mingw-std-threads.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw-std-threads
-    cd mingw-std-threads
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir -p "$FFBUILD_PREFIX"/include
     cp *.h "$FFBUILD_PREFIX"/include
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index dfa9a1c..d0a6546 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
-SCRIPT_COMMIT="9df2e604ddf16765410724716a8d1887ffc61fa9"
+SCRIPT_COMMIT="3638d5e9a6f28354bc3e18f04ba0d97e2cc3b44c"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1
@@ -17,9 +17,12 @@ ffbuild_dockerfinal() {
     to_df "COPY --from=${PREVLAYER} /opt/mingw/. /"
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN retry-tool sh -c \"rm -rf mingw && git clone '$SCRIPT_REPO' mingw\" && cd mingw && git checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw
-    cd mingw
+    cd "$FFBUILD_DLDIR/mingw"
 
     cd mingw-w64-headers
 
@@ -34,6 +37,7 @@ ffbuild_dockerbuild() {
         --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN"
         --host="$FFBUILD_TOOLCHAIN"
         --with-default-win32-winnt="0x601"
+        --with-default-msvcrt=ucrt
         --enable-idl
     )
 
diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh
index 6cb4611..d336ff1 100755
--- a/scripts.d/10-xorg-macros.sh
+++ b/scripts.d/10-xorg-macros.sh
@@ -14,8 +14,7 @@ ffbuild_dockerlayer() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xorg-macros
-    cd xorg-macros
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
     ./configure --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index 789be57..6303f14 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,18 +1,20 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="5448df580c4287b7bfe59d3be0dcbb2227e641d1"
+SCRIPT_COMMIT="6e2b31f6d66739c5abd850338ea68c6bd2012812"
 
 ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv"
-    cd iconv
-    git checkout "$SCRIPT_COMMIT"
+ffbuild_dockerdl() {
+    to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\" && git -C $SELF checkout \"$SCRIPT_COMMIT\""
+    to_df "RUN cd $SELF && retry-tool ./autopull.sh --one-time"
+}
+
+ffbuild_dockerbuild() {
+    cd "$FFBUILD_DLDIR/$SELF"
 
-    retry-tool ./autopull.sh --one-time
     (unset CC CFLAGS GMAKE && ./autogen.sh)
 
     local myconf=(
diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh
index b811727..40dfe1b 100755
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="1e8ab6977d8a990906867514f37528274efebe44"
+SCRIPT_COMMIT="884474477284474e0151280aaa275a18e3d7a036"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2
-    cd libxml2
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh
index c400b17..b9f4d5c 100755
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zlib
-    cd zlib
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh
index 0a5eba0..ede5622 100755
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a"
+SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fftw3
-    cd fftw3
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 1f54520..bcb52ed 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="80a507a6b8e3d2906ad2c8ba69329bd2fb2a85ef"
+SCRIPT_COMMIT="dec2743e6a2a40cddfc8a9892895cb4f861e1eeb"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype
-    cd freetype
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 92a1d5d..b9d824a 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fribidi
-    cd fribidi
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 926f715..3884ce6 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
-SCRIPT_REPO="https://gmplib.org/repo/gmp/"
-SCRIPT_HGREV="614a1cd8bb1d"
+SCRIPT_REPO="https://github.com/BtbN/gmplib.git"
+SCRIPT_COMMIT="1d7f62515fc8f5109fabace9592d863417f17c37"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf gmp && hg clone -r '$SCRIPT_HGREV' -u '$SCRIPT_HGREV' '$SCRIPT_REPO' gmp"
-    cd gmp
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./.bootstrap
 
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index 5b48232..066f8fa 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ogg
-    cd ogg
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 100e60f..63131eb 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -1,17 +1,20 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="openssl-3.0.8"
+SCRIPT_COMMIT="openssl-3.0.9"
 SCRIPT_TAGFILTER="openssl-3.0.*"
 
 ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    default_dl "$SELF"
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1"
+}
+
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl
-    cd openssl
-    git submodule update --init --recursive --depth=1
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         threads
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 4f02f98..4d9581b 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="1dbe12b90cff79bb51923733ac0840747b4b4131"
+SCRIPT_COMMIT="66bdcfa85fef2911cc80f5f30fed3f9610faccb4"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xz
-    cd xz
+    cd "$FFBUILD_DLDIR/$SELF"
 
-    ./autogen.sh --no-po4a
+    ./autogen.sh --no-po4a --no-doxygen
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 5ab0100..aba3f20 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="f0612537cb55ef97835914b0c64497034c60b8c9"
+SCRIPT_COMMIT="7e2a1b2577e8d90ea5be3f14091e809ac7742438"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc
-    cd fc
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh --noconf
 
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index e81ff6f..65c2f38 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="4a93576bca0f56e82a1d8ad67733df9c5ddb8dcd"
+SCRIPT_COMMIT="73ee9c346f3acccbe14a4caf258b636de7c459be"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" harfbuzz
-    cd harfbuzz
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index cff6e1b..701f294 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libsr
-    cd libsr
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build
     cd build
diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh
index e46ea84..58b5780 100755
--- a/scripts.d/45-libudfread.sh
+++ b/scripts.d/45-libudfread.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libudfread
-    cd libudfread
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./bootstrap
 
diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh
index 1499431..4b5cde8 100755
--- a/scripts.d/45-libvorbis.sh
+++ b/scripts.d/45-libvorbis.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vorbis
-    cd vorbis
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 4ae38fb..dfbda16 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -4,22 +4,24 @@ SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
 SCRIPT_COMMIT="e049b16b5f157e2f28e7b5c301e71e1ccb3fe288"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="0b8be9fd5fae61bfd85378ef346f508e4f5cfe61"
+SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067"
 
 ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerbuild() {
-    mkdir opencl && cd opencl
+ffbuild_dockerdl() {
+    default_dl opencl/headers
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" opencl/loader"
+}
+
+ffbuild_dockerbuild() {
+    cd "$FFBUILD_DLDIR"/opencl
 
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers
     mkdir -p "$FFBUILD_PREFIX"/include/CL
     cp -r headers/CL/* "$FFBUILD_PREFIX"/include/CL/.
 
-    git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader
     cd loader
-
     mkdir build && cd build
 
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh
index d14cf2f..356b6be 100755
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@@ -8,10 +8,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone --filter=blob:none "$SCRIPT_REPO" pa
-    cd pa
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
 
     # Kill build of utils and their sndfile dep
     echo > src/utils/meson.build
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index c16f5f5..1ad7bac 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="5ee0051cd7b1337e033558910c30525d73edfd76"
+SCRIPT_COMMIT="98bdd77b296da207ab42c3113ec8f30de58db197"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vmaf
-    cd vmaf
+    cd "$FFBUILD_DLDIR/$SELF"
 
     # Kill build of unused and broken tools
     echo > libvmaf/tools/meson.build
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 894477d..75dfd3d 100755
--- a/scripts.d/45-x11/10-xcbproto.sh
+++ b/scripts.d/45-x11/10-xcbproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-SCRIPT_COMMIT="cfcc51836c1f2c174b67073cc8bed92e7e9c9569"
+SCRIPT_COMMIT="91178913c25b19e0457cdf6d21e00e6a613823e2"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xcbproto
-    cd xcbproto
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index bd0ce74..e0e1428 100755
--- a/scripts.d/45-x11/10-xproto.sh
+++ b/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="5a3d5d624e08cd8fcbe7f4da594dd458f45127d0"
+SCRIPT_COMMIT="766967322209f2dcb72e6a8edea0c651f586201d"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xproto
-    cd xproto
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh
index 775472b..3f582b9 100755
--- a/scripts.d/45-x11/10-xtrans.sh
+++ b/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-SCRIPT_COMMIT="232a11a947564762689e63c3a6603d3f956f696d"
+SCRIPT_COMMIT="3b3a3bd75d86aec78f6ef893b198c3efc378bc64"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxtrans
-    cd libxtrans
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh
index 4c2e8be..19d9fde 100755
--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxau
-    cd libxau
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh
index ea21d78..588568d 100755
--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcb
-    cd libxcb
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index 3fb1bf8..8d90f37 100755
--- a/scripts.d/45-x11/40-libx11.sh
+++ b/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="03ba0140940cc76524d83096a47309f5c398541f"
+SCRIPT_COMMIT="af2b6dfab1616dc85be9c9b196e4c56d00447851"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libx11
-    cd libx11
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh
index c482aa3..2e73d25 100755
--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxext
-    cd libxext
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh
index c60693b..80fa4dd 100755
--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxfixes
-    cd libxfixes
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index aa7a8da..f979476 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxi
-    cd libxi
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh
index 72d96ac..6f24a94 100755
--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxinerama
-    cd libxinerama
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh
index 826ba7d..4f5566f 100755
--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrender
-    cd libxrender
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh
index 10a606b..fec2cab 100755
--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxscrnsaver
-    cd libxscrnsaver
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh
index e18c26d..72dd8fa 100755
--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxxf86vm
-    cd libxxf86vm
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh
index 94efdff..15c439f 100755
--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" glvnd
-    cd glvnd
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 18e4057..eaa36f8 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcursor
-    cd libxcursor
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh
index 42273fd..ab1cdbc 100755
--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrandr
-    cd libxrandr
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh
index 19531b7..980490e 100755
--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@@ -10,8 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv
-    cd libxv
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/45-x11/99-finalize.sh b/scripts.d/45-x11/99-finalize.sh
index 1714e39..c63652b 100755
--- a/scripts.d/45-x11/99-finalize.sh
+++ b/scripts.d/45-x11/99-finalize.sh
@@ -12,6 +12,10 @@ ffbuild_dockerlayer() {
     to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
 }
 
+ffbuild_dockerdl() {
+    return 0
+}
+
 ffbuild_dockerbuild() {
     rm "$FFBUILD_PREFIX"/lib/lib*.so* || true
     rm "$FFBUILD_PREFIX"/lib/*.la || true
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 2bb533b..73ed13c 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="bd5db31d3d8ea1fae7002dd903898599bdb7d97a"
+SCRIPT_COMMIT="68f2396f1a55a5b12767f5433411bb4093ea65ed"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" amf
-    cd amf
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir -p "$FFBUILD_PREFIX"/include
     mv amf/public/include "$FFBUILD_PREFIX"/include/AMF
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 8f7afc2..89b526e 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,19 +1,18 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="d954a78fdae80b49229cb7c4b7032f5c0e67b0e8"
+SCRIPT_COMMIT="83ccc009eade321c8723ae0da8655fc68ce6a128"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom
-    cd aom
+    cd "$FFBUILD_DLDIR/$SELF"
 
     for patch in /patches/*.patch; do
         echo "Applying $patch"
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index e48ada5..e7aa9ff 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="e519af8b49f52c4ac400f50f23b48ebe36a5f4df"
+SCRIPT_COMMIT="82414985c1085737bccd3eedb0aaa997451f5d32"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng
-    cd libpng
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh
index 30a7c05..c032178 100755
--- a/scripts.d/50-aribb24/50-libaribb24.sh
+++ b/scripts.d/50-aribb24/50-libaribb24.sh
@@ -8,12 +8,11 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24
-    cd aribb24
+    cd "$FFBUILD_DLDIR/$SELF"
 
     for patch in /patches/*.patch; do
         echo "Applying $patch"
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 058eabf..4978378 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="237c4505c944937b411bfc56ab044323e327a2fd"
+SCRIPT_COMMIT="fc5b9bc41fd47001b7da39ea777d29c0ede2a2a7"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,8 +9,10 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" avisynth
-    cd avisynth
+    cd "$FFBUILD_DLDIR/$SELF"
+
+    # their version check is insistant on a tag to exist, so make one
+    git tag -a ffbuild -m "FFbuild Version"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh
index 85c7149..cdec6d4 100755
--- a/scripts.d/50-chromaprint.sh
+++ b/scripts.d/50-chromaprint.sh
@@ -12,8 +12,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" chromaprint
-    cd chromaprint
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index e35e769..ca12597 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="fa8ae5776d5603f52725c1a6bc673acb649577fb"
+SCRIPT_COMMIT="a7e12b628472516718d37108fde7d438b14a0372"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" dav1d
-    cd dav1d
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index fb5dcbb..1e4cd15 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -11,10 +11,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone "$SCRIPT_REPO" davs2
-    cd davs2
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
     cd build/linux
 
     local myconf=(
diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh
index 9e6c9c3..e5f69b6 100755
--- a/scripts.d/50-fdk-aac.sh
+++ b/scripts.d/50-fdk-aac.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fdk
-    cd fdk
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index 02986f8..63862b5 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -1,24 +1,28 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="4fd7be29a431441ca31b8db0155875ae2ff4ed47"
+SCRIPT_COMMIT="855f8263d97bbdcaeabaaaa2997e1ccad7c52dc3"
 
 SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT2="2cd175b30366b6e295991ee0540e3e875cce6f2e"
+SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba"
 SCRIPT_BRANCH2="sdk/11.1"
 
 ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    default_dl ffnvcodec
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" ffnvcodec2"
+}
+
 ffbuild_dockerbuild() {
     if [[ $ADDINS_STR == *4.4* || $ADDINS_STR == *5.0* || $ADDINS_STR == *5.1* ]]; then
-        SCRIPT_COMMIT="$SCRIPT_COMMIT2"
+        cd "$FFBUILD_DLDIR"/ffnvcodec2
+    else
+        cd "$FFBUILD_DLDIR"/ffnvcodec
     fi
 
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
-    cd ffnvcodec
-
     make PREFIX="$FFBUILD_PREFIX" install
 }
 
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index 5b32d91..ae465f4 100755
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/dyne/frei0r.git"
-SCRIPT_COMMIT="69819601c671915075bbd1c5c87be01a5feba08d"
+SCRIPT_COMMIT="c3f987c4cc8c1a7f6928e574f4cb272a7770ca6f"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -10,8 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
-    cd frei0r
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 8411df2..e580cd4 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -7,10 +7,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone "$SCRIPT_REPO" gme
-    cd gme
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
index d864353..2ee1b5d 100755
--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="37a0404bc8ccdc39515a5aed706205dc53810019"
+SCRIPT_COMMIT="aaae5b0f4926065136f287876c6bc41631bae692"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" kvazaar
-    cd kvazaar
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 07b278b..e418f67 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass
-    cd ass
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index 1e71eac..8d23987 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libbluray
-    cd libbluray
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./bootstrap
 
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index 33cd082..717e814 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="ed1995b6bda19244070ab5d331111f16f67c8054"
+SCRIPT_COMMIT="413b098564a90a2e6cae192d30642d33a9197a39"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" brotli
-    cd brotli
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 81d7949..adbcf6a 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,18 +1,23 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="c8a4a7aa88f926c00ca4178f6677f83c2fa4e290"
+SCRIPT_COMMIT="c3a4f9ca89ae59c6265a2f1bf2a6d2a87a71fc16"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
     [[ $ADDINS_STR == *5.0* ]] && return -1
+    [[ $ADDINS_STR == *5.1* ]] && return -1
+    [[ $ADDINS_STR == *6.0* ]] && return -1
     return 0
 }
 
+ffbuild_dockerdl() {
+    default_dl "$SELF"
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway third_party/skcms"
+}
+
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl
-    cd jxl
-    git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms}
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
@@ -27,7 +32,7 @@ ffbuild_dockerbuild() {
 
     cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
         -DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-        -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
+        -DJPEGXL_ENABLE_JPEGLI=OFF -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
         -DJPEGXL_ENABLE_DEVTOOLS=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON ..
     ninja -j$(nproc)
     ninja install
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index e5418f2..352e3f2 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -7,9 +7,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN retry-tool sh -c \"rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame\""
+}
+
 ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame"
-    cd lame
+    cd "$FFBUILD_DLDIR"/lame
 
     autoreconf -i
 
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 5b6ab88..e69f098 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="5023249b5c935545fb02dbfe845cae996ecfc8bb"
+SCRIPT_COMMIT="9fc8fc4cf432640f284113ba502ee027268b0d9f"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus
-    cd opus
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh
index 40bf430..404abda 100755
--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mbedtls
-    cd mbedtls
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh
index 94569eb..0b648ba 100755
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/rist/librist.git"
-SCRIPT_COMMIT="234c2e224c1dc60276a7b427acd3cc0f8bdb3bda"
+SCRIPT_COMMIT="04ba78abb6f8f673da0cc75056df876178e504fb"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" librist
-    cd librist
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh
index 1bf0948..9f4b611 100755
--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="2bf49e3e65912fd26c06fc4aa37a72eeedfec9d8"
+SCRIPT_COMMIT="a7f85944c8c04cd1aba1a122b766f5d04db51050"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libssh
-    cd libssh
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh
index 11f5ac1..79b7603 100755
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" theora
-    cd theora
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index d93ae4f..f16cc1e 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="ad5677eafceac4eccf7a7fd506a4e1f081cea22d"
+SCRIPT_COMMIT="b2c2955c8200ff434f178009df41a1e1e1623156"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx
-    cd libvpx
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --disable-shared
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index ac44dd6..2579d7e 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="e3366659a019515de765a281567242ceaa6eaf75"
+SCRIPT_COMMIT="eac3bd5c53da8bec55a635c6f4234c9cd5753820"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp
-    cd webp
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh
index 157f3d3..7a14ca7 100755
--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="52a96cec13bf2d541c42f8f398e7ea1387c6f56d"
+SCRIPT_COMMIT="bb6a2103c7adf3c1339728915d7f1497ee98dcbf"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2
-    cd lv2
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 8df2e77..3a5cbcb 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd
-    cd serd
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh
index 0a300aa..534e224 100755
--- a/scripts.d/50-lilv/96-zix.sh
+++ b/scripts.d/50-lilv/96-zix.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="a13ae5ad9dc70075740f11139f1db96cc79faa59"
+SCRIPT_COMMIT="a5c18d52a5351430d370084f25aaf7d166f7afd5"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zix
-    cd zix
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh
index 819e3f2..cce7dda 100755
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord
-    cd sord
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh
index 150d70f..d32e200 100755
--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="6805327a511242ce9697ccfb98be4569d8883e33"
+SCRIPT_COMMIT="b97b447d77fbf172260b4b40f184959f59c3623e"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom
-    cd sratom
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh
index a352455..d026da6 100755
--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="d564baafed0863813a87d872f8663134e74228c8"
+SCRIPT_COMMIT="54b32c1949d60225602a7161d5d6c4853230307a"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv
-    cd lilv
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh
index 19a6dc4..1e6aee5 100755
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="fcabffb463299a8792c6baed69afbb69236ba6cb"
+SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5"
 
 ffbuild_enabled() {
     [[ $TARGET == *arm64 ]] && return -1
@@ -12,8 +12,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" onevpl
-    cd onevpl
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index f7ed3f3..7da1fa1 100755
--- a/scripts.d/50-openal.sh
+++ b/scripts.d/50-openal.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="cd781b1511d437816aac65f89646bd80dbf7c040"
+SCRIPT_COMMIT="05f9ce8b978239cebecef1a60f0d451a118fa3df"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -11,8 +11,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openal
-    cd openal
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir cm_build && cd cm_build
 
diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh
index b72d70d..02309a4 100755
--- a/scripts.d/50-opencore-amr.sh
+++ b/scripts.d/50-opencore-amr.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opencore
-    cd opencore
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh
index 7a90d22..476489c 100755
--- a/scripts.d/50-openh264.sh
+++ b/scripts.d/50-openh264.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openh264
-    cd openh264
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         PREFIX="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 76bb967..1a8fd49 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openjpeg
-    cd openjpeg
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index 9b72c7b..b3803f6 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="19363"
+SCRIPT_REV="19445"
 
 ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN retry-tool sh -c \"rm -rf openmpt && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' openmpt\""
+}
+
 ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf openmpt && svn checkout '${SCRIPT_REPO}@${SCRIPT}' openmpt"
-    cd openmpt
+    cd "$FFBUILD_DLDIR"/openmpt
 
     local myconf=(
         PREFIX="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 2044052..eb8c37c 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="005a86d38a2eef5004bdc415b504e66accd246e0"
+SCRIPT_COMMIT="5ec4f95d9fe1a9295fe8239e2860c8f84e5e2336"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rav1e
-    cd rav1e
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 3dc4081..e3577c4 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="7d5b101d278ac4f7eb557d481013b3cc5d8da478"
+SCRIPT_COMMIT="1eddafd7a7c8b64e377d64ee5e87ead881a32a48"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rubberband
-    cd rubberband
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-schannel.sh b/scripts.d/50-schannel.sh
index 4546e2b..2ea5efa 100755
--- a/scripts.d/50-schannel.sh
+++ b/scripts.d/50-schannel.sh
@@ -6,6 +6,10 @@ ffbuild_enabled() {
     [[ $TARGET == win* ]]
 }
 
+ffbuild_dockerdl() {
+    return 0
+}
+
 ffbuild_dockerstage() {
     return 0
 }
@@ -14,6 +18,10 @@ ffbuild_dockerbuild() {
     return 0
 }
 
+ffbuild_dockerlayer_dl() {
+    return 0
+}
+
 ffbuild_configure() {
     echo --enable-schannel
 }
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 90df797..bf6b0c2 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="5007b963639bff2fa3359abbfe20d53ea9111fd9"
+SCRIPT_COMMIT="e16a83d393ae1784040519f42c482e2641b971a2"
 SCRIPT_BRANCH="SDL2"
 
 ffbuild_enabled() {
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sdl
-    cd sdl
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh
index f351fa6..f3651aa 100755
--- a/scripts.d/50-soxr.sh
+++ b/scripts.d/50-soxr.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" soxr
-    cd soxr
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 7807899..d40e9da 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="3cefedefe91fca543083d260d1ed32efd2e7cba5"
+SCRIPT_COMMIT="61c7bedf27a2edbcf6e6fdc179612980bae53c6a"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" srt
-    cd srt
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 043b85c..66b6600 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,17 +1,19 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="0f8b3a81363b7148f90a07f026f69c97d11e0363"
+SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone "$SCRIPT_REPO" svtav1
-    cd svtav1
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh
index 2dac91d..8e8a60b 100755
--- a/scripts.d/50-twolame.sh
+++ b/scripts.d/50-twolame.sh
@@ -8,8 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" twolame
-    cd twolame
+    cd "$FFBUILD_DLDIR/$SELF"
 
     NOCONFIGURE=1 ./autogen.sh
     touch doc/twolame.1
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 02ca0e5..38e56bd 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -8,10 +8,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone "$SCRIPT_REPO" uavs3d
-    cd uavs3d
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build/linux
     cd build/linux
diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh
index ff55e48..83dfbc2 100755
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpciaccess
-    cd libpciaccess
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -fi
 
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 3a556a0..f2b3d4c 100755
--- a/scripts.d/50-vaapi/40-libdrm.sh
+++ b/scripts.d/50-vaapi/40-libdrm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git"
-SCRIPT_COMMIT="98e1db501173303e58ef6a1def94ab7a2d84afc1"
+SCRIPT_COMMIT="7d7a9901bd67cf5b1ce07e5d237a82e13e9fb500"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libdrm
-    cd libdrm
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh
index 0c2e38e..ed3d88f 100755
--- a/scripts.d/50-vaapi/50-libva.sh
+++ b/scripts.d/50-vaapi/50-libva.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/intel/libva.git"
-SCRIPT_COMMIT="1114bd2b3ef7b6467f94c15cab3e061d3c197571"
+SCRIPT_COMMIT="984dfee4177021c400367f5dffc0776a6dd745dc"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -10,8 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libva
-    cd libva
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 
diff --git a/scripts.d/50-vaapi/99-finalize.sh b/scripts.d/50-vaapi/99-finalize.sh
index 5435582..ee8a518 100755
--- a/scripts.d/50-vaapi/99-finalize.sh
+++ b/scripts.d/50-vaapi/99-finalize.sh
@@ -7,6 +7,10 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    return 0
+}
+
 ffbuild_dockerbuild() {
     rm "$FFBUILD_PREFIX"/lib/lib*.so* || true
     rm "$FFBUILD_PREFIX"/lib/*.la || true
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 89c8820..c9a3b4c 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git"
-SCRIPT_COMMIT="77f3ba1b9a8d67be616ce576f24b4b4a73333e82"
+SCRIPT_COMMIT="05829db776069b7478dd2d90b6e0081668a41abc"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab
-    cd vidstab
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 2dda908..c1a718b 100755
--- a/scripts.d/50-vulkan/45-vulkan.sh
+++ b/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.251"
+SCRIPT_COMMIT="v1.3.257"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {
@@ -10,8 +10,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vkheaders
-    cd vkheaders
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index bf890b5..576dc37 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,18 +1,20 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="95ea3c915aa48ecdeda2f14db73983d1be3f9209"
+SCRIPT_COMMIT="e31c4c2e41544d63d90be28c46e4a4793a624240"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
     return 0
 }
 
-ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" shaderc
-    cd shaderc
+ffbuild_dockerdl() {
+    default_dl "$SELF"
+    to_df "RUN cd \"$SELF\" && ./utils/git-sync-deps"
+}
 
-    ./utils/git-sync-deps
+ffbuild_dockerbuild() {
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 61317a4..f5d189c 100755
--- a/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="12542fc6fc05000e04742daf93892a0b10edbe80"
+SCRIPT_COMMIT="b8e742c91ba47eb3238c939ee11ec9ba2ba247bf"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" spirv-cross
-    cd spirv-cross
+    cd "$FFBUILD_DLDIR/$SELF"
 
     VER_MAJ="$(grep 'set(spirv-cross-abi-major' CMakeLists.txt | sed -re 's/.* ([0-9]+)\)/\1/')"
     VER_MIN="$(grep 'set(spirv-cross-abi-minor' CMakeLists.txt | sed -re 's/.* ([0-9]+)\)/\1/')"
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 723647a..0987426 100755
--- a/scripts.d/50-vulkan/60-libplacebo.sh
+++ b/scripts.d/50-vulkan/60-libplacebo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git"
-SCRIPT_COMMIT="3e25675dc10d98ac67d1ca2af9f07b79c543dc77"
+SCRIPT_COMMIT="b959cab8b859dc53a6dbd26c050be0b3883114c8"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
@@ -11,10 +11,13 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    default_dl "$SELF"
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive"
+}
+
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo
-    cd placebo
-    git submodule update --init --recursive
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 
diff --git a/scripts.d/50-vulkan/99-enable.sh b/scripts.d/50-vulkan/99-enable.sh
index f9f8977..d83e3cb 100755
--- a/scripts.d/50-vulkan/99-enable.sh
+++ b/scripts.d/50-vulkan/99-enable.sh
@@ -7,6 +7,10 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    return 0
+}
+
 ffbuild_dockerbuild() {
     return 0
 }
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 38997cb..0060cf3 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -9,8 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" x264
-    cd x264
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --disable-cli
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index a5e4b2e..14bc515 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,17 +1,19 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="34532bda12a3a3141880582aa186a59cd4538ae6"
+SCRIPT_COMMIT="8f18e3ad32684eee95e885e718655f93951128c3"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone "$SCRIPT_REPO" x265
-    cd x265
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local common_config=(
         -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX"
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index bd128b3..36b1e65 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -11,10 +11,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
+}
+
 ffbuild_dockerbuild() {
-    git clone "$SCRIPT_REPO" xavs2
-    cd xavs2
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"
     cd build/linux
 
     local myconf=(
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index 0db384d..484d2fa 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -8,9 +8,12 @@ ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    to_df "RUN retry-tool sh -c \"rm -rf xvid && svn checkout --username 'anonymous' --password '' '${SCRIPT_REPO}@${SCRIPT_REV}' xvid\""
+}
+
 ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf xvid && svn checkout --username 'anonymous' --password '' '${SCRIPT_REPO}@${SCRIPT_REV}' xvid"
-    cd xvid
+    cd "$FFBUILD_DLDIR"/xvid
 
     cd build/generic
 
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 70087bd..49bc5bb 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="332aaac5e99de46ddd5663092779742ec1958b11"
+SCRIPT_COMMIT="ec0c604a9e29dd144b0bb1fb0974ac3b398fc18b"
 
 ffbuild_enabled() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    default_dl "$SELF"
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1"
+}
+
 ffbuild_dockerbuild() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg
-    cd zimg
-    git submodule update --init --recursive --depth=1
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 
diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh
index d0c8031..5f7cb97 100755
--- a/scripts.d/50-zvbi.sh
+++ b/scripts.d/50-zvbi.sh
@@ -8,12 +8,15 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh"
+}
+
+ffbuild_dockerdl() {
+    to_df "RUN retry-tool sh -c \"rm -rf $SELF && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' $SELF\""
 }
 
 ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf zvbi && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' zvbi"
-    cd zvbi
+    cd "$FFBUILD_DLDIR/$SELF"
 
     for patch in /patches/*.patch; do
         echo "Applying $patch"
diff --git a/scripts.d/99-rpath.sh b/scripts.d/99-rpath.sh
index c5d3256..be7bc33 100755
--- a/scripts.d/99-rpath.sh
+++ b/scripts.d/99-rpath.sh
@@ -10,6 +10,10 @@ ffbuild_dockerfinal() {
     return 0
 }
 
+ffbuild_dockerdl() {
+    return 0
+}
+
 ffbuild_dockerlayer() {
     return 0
 }
@@ -18,6 +22,10 @@ ffbuild_dockerstage() {
     return 0
 }
 
+ffbuild_dockerlayer_dl() {
+    return 0
+}
+
 ffbuild_dockerbuild() {
     return 0
 }
diff --git a/util/get_dl_cache_tag.sh b/util/get_dl_cache_tag.sh
new file mode 100755
index 0000000..4ca3a36
--- /dev/null
+++ b/util/get_dl_cache_tag.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -eo pipefail
+printf dlcache_
+tail -n+3 Dockerfile.dl | sha256sum | cut -d' ' -f1
diff --git a/util/vars.sh b/util/vars.sh
index 656ac06..0fd91ef 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -37,8 +37,23 @@ BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
 TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
 IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"
 
+DL_IMAGE_RAW="${REGISTRY}/${REPO}/dl_cache"
+if [[ -n "$REGISTRY_OVERRIDE_DL" && -n "$GITHUB_REPOSITORY_DL" ]]; then
+    DL_IMAGE_RAW="${REGISTRY_OVERRIDE_DL}/${GITHUB_REPOSITORY_DL}/dl_cache"
+    DL_IMAGE_RAW="${DL_IMAGE_RAW,,}"
+fi
+DL_IMAGE="${DL_IMAGE_RAW}:unset"
+
+ffbuild_dockerdl() {
+    default_dl "$SELF"
+}
+
+ffbuild_dockerlayer_dl() {
+    to_df "COPY --from=${SELFLAYER} \$FFBUILD_DLDIR/. \$FFBUILD_DLDIR"
+}
+
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh"
 }
 
 ffbuild_dockerlayer() {
diff --git a/variants/dl-only.sh b/variants/dl-only.sh
new file mode 100644
index 0000000..a9bf588
--- /dev/null
+++ b/variants/dl-only.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/variants/linux-install-shared.sh b/variants/linux-install-shared.sh
index ef8e791..5507cb6 100644
--- a/variants/linux-install-shared.sh
+++ b/variants/linux-install-shared.sh
@@ -23,4 +23,7 @@ package_variant() {
 
     mkdir -p "$OUT"/doc
     cp -r "$IN"/share/doc/ffmpeg/* "$OUT"/doc
+
+    mkdir -p "$OUT/man"
+    cp -r "$IN"/share/man/* "$OUT"/man
 }
diff --git a/variants/linux-install-static.sh b/variants/linux-install-static.sh
new file mode 100644
index 0000000..6c6a4e6
--- /dev/null
+++ b/variants/linux-install-static.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+package_variant() {
+    IN="$1"
+    OUT="$2"
+
+    mkdir -p "$OUT"/bin
+    cp "$IN"/bin/* "$OUT"/bin
+
+    mkdir -p "$OUT/doc"
+    cp -r "$IN"/share/doc/ffmpeg/* "$OUT"/doc
+
+    mkdir -p "$OUT/man"
+    cp -r "$IN"/share/man/* "$OUT"/man
+}
diff --git a/variants/linux64-gpl.sh b/variants/linux64-gpl.sh
index b3003a4..bd5fc12 100644
--- a/variants/linux64-gpl.sh
+++ b/variants/linux64-gpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/linux64-lgpl.sh b/variants/linux64-lgpl.sh
index f000a33..da1f9b7 100644
--- a/variants/linux64-lgpl.sh
+++ b/variants/linux64-lgpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/linuxarm64-gpl.sh b/variants/linuxarm64-gpl.sh
index b3003a4..bd5fc12 100644
--- a/variants/linuxarm64-gpl.sh
+++ b/variants/linuxarm64-gpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/linuxarm64-lgpl.sh b/variants/linuxarm64-lgpl.sh
index f000a33..da1f9b7 100644
--- a/variants/linuxarm64-lgpl.sh
+++ b/variants/linuxarm64-lgpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/win32-gpl.sh b/variants/win32-gpl.sh
index b3003a4..d629915 100644
--- a/variants/win32-gpl.sh
+++ b/variants/win32-gpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/win32-lgpl.sh b/variants/win32-lgpl.sh
index f000a33..f360d75 100644
--- a/variants/win32-lgpl.sh
+++ b/variants/win32-lgpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/win64-gpl.sh b/variants/win64-gpl.sh
index b3003a4..d629915 100644
--- a/variants/win64-gpl.sh
+++ b/variants/win64-gpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh
diff --git a/variants/win64-lgpl.sh b/variants/win64-lgpl.sh
index f000a33..f360d75 100644
--- a/variants/win64-lgpl.sh
+++ b/variants/win64-lgpl.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-source "$(dirname "$BASH_SOURCE")"/default-install.sh
+source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh
 source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh
diff --git a/variants/default-install.sh b/variants/windows-install-static.sh
similarity index 100%
rename from variants/default-install.sh
rename to variants/windows-install-static.sh