diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3616694c67..dd6a3107c8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -152,7 +152,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [win64,linux64,linuxarm64]
-        variant: [gpl,nonfree,gpl 5.1,gpl 6.1,gpl 7.0,nonfree 5.1,nonfree 6.1,nonfree 7.0,gpl-shared,nonfree-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.0,nonfree-shared 5.1,nonfree-shared 6.1,nonfree-shared 7.0]
+        variant: [gpl,nonfree,gpl 5.1,gpl 6.1,gpl 7.1,nonfree 5.1,nonfree 6.1,nonfree 7.1,gpl-shared,nonfree-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.1,nonfree-shared 5.1,nonfree-shared 6.1,nonfree-shared 7.1]
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
@@ -217,7 +217,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [win64,linux64,linuxarm64]
-        variant: [gpl,nonfree,gpl 5.1,gpl 6.1,gpl 7.0,nonfree 5.1,nonfree 6.1,nonfree 7.0,gpl-shared,nonfree-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.0,nonfree-shared 5.1,nonfree-shared 6.1,nonfree-shared 7.0]
+        variant: [gpl,nonfree,gpl 5.1,gpl 6.1,gpl 7.1,nonfree 5.1,nonfree 6.1,nonfree 7.1,gpl-shared,nonfree-shared,gpl-shared 5.1,gpl-shared 6.1,gpl-shared 7.1,nonfree-shared 5.1,nonfree-shared 6.1,nonfree-shared 7.1]
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
diff --git a/addins/7.1.sh b/addins/7.1.sh
new file mode 100644
index 0000000000..0ddb8340a1
--- /dev/null
+++ b/addins/7.1.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+GIT_BRANCH="release/7.1"
diff --git a/generate.sh b/generate.sh
index 2ad85643cb..a3536db49e 100755
--- a/generate.sh
+++ b/generate.sh
@@ -49,7 +49,7 @@ 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"
-to_df "COPY util/run_stage.sh /usr/bin/run_stage"
+to_df "COPY --link util/run_stage.sh /usr/bin/run_stage"
 
 for addin in "${ADDINS[@]}"; do
 (
diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config
index 9cc804127e..3a627153b6 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.26.0.106_ed12fa6 Configuration
+# crosstool-NG 1.26.0.120_4d36f27 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -29,7 +29,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.26.0.106_ed12fa6"
+CT_VERSION="1.26.0.120_4d36f27"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -384,7 +384,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_42=y
+CT_BINUTILS_V_2_43=y
+# CT_BINUTILS_V_2_42 is not set
 # CT_BINUTILS_V_2_41 is not set
 # CT_BINUTILS_V_2_40 is not set
 # CT_BINUTILS_V_2_39 is not set
@@ -401,7 +402,7 @@ CT_BINUTILS_V_2_42=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.42"
+CT_BINUTILS_VERSION="2.43.1"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config
index 0bc80ffc95..57871f6238 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.26.0.108_146fee5 Configuration
+# crosstool-NG 1.26.0.120_4d36f27 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -29,7 +29,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.26.0.108_146fee5"
+CT_VERSION="1.26.0.120_4d36f27"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -390,7 +390,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_42=y
+CT_BINUTILS_V_2_43=y
+# CT_BINUTILS_V_2_42 is not set
 # CT_BINUTILS_V_2_41 is not set
 # CT_BINUTILS_V_2_40 is not set
 # CT_BINUTILS_V_2_39 is not set
@@ -407,7 +408,7 @@ CT_BINUTILS_V_2_42=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.42"
+CT_BINUTILS_VERSION="2.43.1"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config
index 3be272b6f6..003d9d6294 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.26.0.106_ed12fa6 Configuration
+# crosstool-NG 1.26.0.120_4d36f27 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -29,7 +29,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.26.0.106_ed12fa6"
+CT_VERSION="1.26.0.120_4d36f27"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -297,7 +297,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_42=y
+CT_BINUTILS_V_2_43=y
+# CT_BINUTILS_V_2_42 is not set
 # CT_BINUTILS_V_2_41 is not set
 # CT_BINUTILS_V_2_40 is not set
 # CT_BINUTILS_V_2_39 is not set
@@ -314,7 +315,7 @@ CT_BINUTILS_V_2_42=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.42"
+CT_BINUTILS_VERSION="2.43.1"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config
index 67c99f1d4f..f92fe4fc3e 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.26.0.106_ed12fa6 Configuration
+# crosstool-NG 1.26.0.120_4d36f27 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@@ -29,7 +29,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.26.0.106_ed12fa6"
+CT_VERSION="1.26.0.120_4d36f27"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -297,7 +297,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_42=y
+CT_BINUTILS_V_2_43=y
+# CT_BINUTILS_V_2_42 is not set
 # CT_BINUTILS_V_2_41 is not set
 # CT_BINUTILS_V_2_40 is not set
 # CT_BINUTILS_V_2_39 is not set
@@ -314,7 +315,7 @@ CT_BINUTILS_V_2_42=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.42"
+CT_BINUTILS_VERSION="2.43.1"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 57ffd7563e..8e55814a2e 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="1b554dec06f8d3c26b856a7d1575f396d8ffa403"
+SCRIPT_COMMIT="8f7b5ce363fbfa9d66a38034525cf0fdae4385a3"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1
@@ -10,8 +10,8 @@ ffbuild_enabled() {
 
 ffbuild_dockerlayer() {
     [[ $TARGET == winarm* ]] && return 0
-    to_df "COPY --from=${SELFLAYER} /opt/mingw/. /"
-    to_df "COPY --from=${SELFLAYER} /opt/mingw/. /opt/mingw"
+    to_df "COPY --link --from=${SELFLAYER} /opt/mingw/. /"
+    to_df "COPY --link --from=${SELFLAYER} /opt/mingw/. /opt/mingw"
 }
 
 ffbuild_dockerfinal() {
diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh
index 53127336ef..6dd252d79f 100755
--- a/scripts.d/10-xorg-macros.sh
+++ b/scripts.d/10-xorg-macros.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
-SCRIPT_COMMIT="7ed2b3798c030bd1729b699b446b43aba2ec606e"
+SCRIPT_COMMIT="91ece2a5f6408d34074522c8588ef1c53478daa0"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
@@ -9,8 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerlayer() {
-    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
-    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
+    to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+    to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index d6af66919c..22b915d83a 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="0d94621c1e182f5a13a9504523afcb01ec546b37"
+SCRIPT_COMMIT="eed6782cbb4651876e3c8b27ea53273f230ee8e2"
+
+SCRIPT_REPO2="https://git.savannah.gnu.org/git/gnulib.git"
+SCRIPT_COMMIT2="cc292ecda26359d5a80989bdbd1633f2f0721628"
 
 ffbuild_enabled() {
     return 0
@@ -9,7 +12,7 @@ ffbuild_enabled() {
 
 ffbuild_dockerdl() {
     echo "retry-tool sh -c \"rm -rf iconv && git clone '$SCRIPT_REPO' iconv\" && git -C iconv checkout \"$SCRIPT_COMMIT\""
-    echo "cd iconv && retry-tool ./autopull.sh --one-time"
+    echo "cd iconv && retry-tool sh -c \"rm -rf gnulib && git clone '$SCRIPT_REPO2' gnulib\" && git -C gnulib checkout \"$SCRIPT_COMMIT2\" && rm -rf gnulib/.git"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index b9e5cfecac..d6921eb9d1 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="d2612e1c3ff839595fbf67c8263a07d6bac3aaf5"
+SCRIPT_COMMIT="c82745878da1acef2ce6bd7e17a8d59b8612d509"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 42493491da..e269566b39 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="3826589ea556da613bd42742a169789469e8b635"
+SCRIPT_COMMIT="68162babff4f39c4e2dc164a5e825af93bda9983"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/25-libxml2.sh b/scripts.d/25-libxml2.sh
index f169d413e9..5eb497577b 100755
--- a/scripts.d/25-libxml2.sh
+++ b/scripts.d/25-libxml2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
-SCRIPT_COMMIT="40abebbc739fb4cddfc205eeb129cefe9b9f6e5b"
+SCRIPT_COMMIT="d67833a3c5db7999820a73e356327d47ec76bea9"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 268aa65347..2fdf8a8ad3 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -21,7 +21,6 @@ ffbuild_dockerbuild() {
         no-tests
         no-apps
         no-legacy
-        no-ssl2
         no-ssl3
         enable-camellia
         enable-ec
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 62dd710a61..fc40a98432 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/tukaani-project/xz.git"
-SCRIPT_COMMIT="68c54e45d042add64a4cb44bfc87ca74d29b87e2"
+SCRIPT_COMMIT="dbca3d078ec581600600abebbb18769d3d713914"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 4299d16db1..1c3328c4d3 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="bd83c04aa6f3cb864ba60dc5eaf2b41c4c269c63"
+SCRIPT_COMMIT="211cc5f2ea5523f9dc2430de4fd8e5b423465e86"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index 4a90b0a7a5..0ae01bb023 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="a070f9ebbe88dc71b248af9731dd49ec93f4e6e6"
+SCRIPT_COMMIT="b6196986d7f17cd5d6aebec88b527726b1493a9c"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index 71e1dd3b9f..5ba480eeb0 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="d79beab14769efdff4ff9106cdc47268575d6891"
+SCRIPT_COMMIT="862f06c64c222b683f22a872120fc066040dd2c8"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="3d27d7ca04d29fabe608a2372ce693601bcc4e81"
+SCRIPT_COMMIT2="804b6f040503c47148bee535230070da6b857ae4"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh
index 2d216c1250..6f14bc3b8a 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="77d7fc04da729ddc5ed4aacf30253726fac24dca"
+SCRIPT_COMMIT="4d2879ad9e394ff832762e8961eca9415cc9934c"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh
index 2bbe9af095..338a4c9629 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="3076552555c32cb89ec20ddef638317f0ea303b9"
+SCRIPT_COMMIT="d7ea44d5f04cc476dee83ef439a847172f7a6bd1"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh
index b85d320313..ad4731f4f0 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="19b2f5c2d0935cbf9c17ecf30604f80592807b59"
+SCRIPT_COMMIT="f2ebbce6d0978d2d84f840196b03ee35a3ca1736"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh
index c84a9120fe..4a71bbf70f 100755
--- a/scripts.d/45-x11/50-libxi.sh
+++ b/scripts.d/45-x11/50-libxi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git"
-SCRIPT_COMMIT="a5af26c654b4da5fd5eaaeaa2173c734ab9e63ec"
+SCRIPT_COMMIT="3c2d5aedd7708c75710b39268631762de904c304"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh
index 3fcf34eb9a..aa24cb4d08 100755
--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="09617bcc9a0f1b5072212da5f8fede92ab85d157"
+SCRIPT_COMMIT="833735e3232e28153411b3703dfe51883edf47ea"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/45-x11/99-finalize.sh b/scripts.d/45-x11/99-finalize.sh
index c63652b1c0..2b1105564e 100755
--- a/scripts.d/45-x11/99-finalize.sh
+++ b/scripts.d/45-x11/99-finalize.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerlayer() {
-    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
-    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
+    to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+    to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
 }
 
 ffbuild_dockerdl() {
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index ec7854d26e..a32e013fe8 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="a6fca4a3bb5585bd0bca4d1a531c40e39f5f572b"
+SCRIPT_COMMIT="3588c60e2657cc9cbcff5b5ea089b08276049e5d"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index 5bf05c0e9a..63ed7dc1dd 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="778bc191f1eecf1b3f9c68f8e3ca7857c3437f1d"
+SCRIPT_COMMIT="a42ea198de1e1438f5ee462bd599d082c924bc35"
 
 ffbuild_enabled() {
     [[ $TARGET == winarm64 ]] && return -1
diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh
index 92f4d62fdb..5fb388a2ba 100755
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="532fec021404a5f5ceda068d176fd2ab1cd1955c"
+SCRIPT_COMMIT="d3cf9b6e22fca25273e87d0b11882a7f886c97fe"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 42f994f536..2ee7851780 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="2b55ba40ec22652d72121fcef56b46da1fc2e427"
+SCRIPT_COMMIT="b2225100a27da3e110b546700394342bd2001ec5"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 4f9ede38c9..40c7269d4b 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="cc6eb3d53deb4c739a16230136945c1a0dca05b0"
+SCRIPT_COMMIT="21d9f29d388c230a7fe4e964397399247162bd5e"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh
index fa2fc7d710..f0441644da 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="cbb507dbbccc87b0d8e887e75ad4bff732f63e3f"
+SCRIPT_COMMIT="b528b26fd4ccffaa6692890ea174b26dd321e278"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index eafedf27b6..4253d17100 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libgme/game-music-emu.git"
-SCRIPT_COMMIT="05a2aa29e8eae29316804fdd28ceaa96c74a1531"
+SCRIPT_COMMIT="cb2c1ccc7563ed58321cc3b6b8507b9015192b80"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh
index 07e81b6655..42a95f5aae 100755
--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="2f9a21423a1ef666c93f15e2068bcde979d20f7e"
+SCRIPT_COMMIT="6b7f065bd8c1e265b50bafa7e84248fb09a391c9"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 16ecbd97ae..ac4a80f599 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="3a7a9b99e75fb094f243d4b086b414556a0d9947"
+SCRIPT_COMMIT="5298859c298d3c570d8d7e3b883a0d63490659b8"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh
index b8f1b3802c..83ac695683 100755
--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="39bcecf4559f9b0e75c6248a75d9c0db6b123d88"
+SCRIPT_COMMIT="350100a5bb9d9671aca85213b2ec7a70a361b0cd"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh
index 3cd0c69082..9c14e4a4d8 100755
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="960d97c0b73fe081a7cd00afc3fac1bfaf441452"
+SCRIPT_COMMIT="57dd9253b9bc0d1875584666b3c151636925e338"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 00bf329079..3c8d32160f 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="5854a9f7de06ab3505b8fe6e8943db581c2cbe70"
+SCRIPT_COMMIT="ff6dea5e1a72b8a2aeb7fc3656857d86a420ab89"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index e6ea876bf0..df1534e1ec 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="fbf63dff1f528d44f24bd662abb89fd01a4a1c25"
+SCRIPT_COMMIT="b15d2ac26f3a67a835c5c0d8ac4f07e12902e608"
 
 ffbuild_enabled() {
     [[ $TARGET == winarm64 ]] && return -1
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index c7665eb75e..9236a7641d 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="2e81017c7a345f687223086cbc177a8459a18b52"
+SCRIPT_COMMIT="874069042ead095f8a8d6bdd35b9b145ce80af43"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh
index 314de9c5d3..95d2930560 100755
--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="ebe0b8697bca69abb7e7be1c731da4d54b10e462"
+SCRIPT_COMMIT="4256d4693dfbdc9b69cb010832a0d8a463d590b4"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh
index 1d6a6af7d4..7caf2c0e8a 100755
--- a/scripts.d/50-lilv/96-zix.sh
+++ b/scripts.d/50-lilv/96-zix.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="0d200a53e73d5c92447e19ba2a00d8e7bf36fd03"
+SCRIPT_COMMIT="50c73ad346fb63eb6d057dcc7d1351c95e12e83d"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh
index 72b903f198..c33f45dfd4 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="a4e126acb856e53ed1c35a847aa3e0a4cb16c962"
+SCRIPT_COMMIT="7898f70b441ff7d4ac78f3bdeb46992dfbea298f"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 781867046d..705dda81ad 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="606304d08365469d0fd685f2312791fc0feac15f"
+SCRIPT_COMMIT="362ec6c92dbc0f563810fafe552e4fa0d9fde024"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh
index dc31177476..54942c4bc7 100755
--- a/scripts.d/50-openmpt.sh
+++ b/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="21571"
+SCRIPT_REV="21782"
 
 ffbuild_enabled() {
     [[ $TARGET == winarm64 ]] && return -1
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 5aa1eb7c2c..ff3fe228ee 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="7ab0de1fe907b16e3ce6c7ff0e15d27f71e5d5b4"
+SCRIPT_COMMIT="09a4111ff5e4fd803927ba47ad2c96551d4fd2f3"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 8e3adb1759..919d269a08 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="4e8419232bd15bc1de9af2aa42ed3ac6bc8722ba"
+SCRIPT_COMMIT="48e08a5113ced935451833e554d39f8fca31276f"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 8f5b7fe6b8..22fc377c35 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="10b4a79379d226041781d0a825da79a296af715f"
+SCRIPT_COMMIT="e4126d8d6f24804fddc5dbb9821f1866b97d66b0"
 SCRIPT_BRANCH="SDL2"
 
 ffbuild_enabled() {
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index b8a1922fdf..7522c30b5a 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="9c7206f0190c0c800a5ee1e71ee61ec0d4c7e216"
+SCRIPT_COMMIT="a7b3711a8a862e697f641b296743cc7c921f5fba"
 
 ffbuild_enabled() {
     return 0
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 2b07615b92..72cb86716e 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="85e44db4b49fcbf8fea2472bdd517e8aa8e1c1a0"
+SCRIPT_COMMIT="13a54d08f161bd1ff21a6259b8ed54b279691d6e"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh
index 4d94fd9090..1e502e49d0 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="25dec5b91fe4d2638787d033a0b22b6c1dc145e0"
+SCRIPT_COMMIT="c0a08f06aec84c3be102e57a56e01d639be253bb"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh
index 8de6378885..61e4d19409 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.295"
+SCRIPT_COMMIT="v1.3.297"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {
diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh
index 40698d9a5d..8dfa756c15 100755
--- a/scripts.d/50-vulkan/50-shaderc.sh
+++ b/scripts.d/50-vulkan/50-shaderc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="6d2848321250a19641800f8afb07738f3b0b7f18"
+SCRIPT_COMMIT="d2564ba5989c9de1a76714b3e59ec60595e9be50"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh
index 21a3385cb6..ccf4118f77 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="6a1fb66eef1bdca14acf7d0a51a3f883499d79f0"
+SCRIPT_COMMIT="b28b3559d3882f918825cd90342dcfa955770bad"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh
index 5814a9db3d..65f83f0dfe 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="efb89342b0c19b9773226624651839686172e88b"
+SCRIPT_COMMIT="756220c3ee760eb62c0b89172e80f713f89fe571"
 
 ffbuild_enabled() {
     [[ $ADDINS_STR == *4.4* ]] && return -1
diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh
index 245fbc61a6..e7e1a26512 100755
--- a/scripts.d/50-vvenc.sh
+++ b/scripts.d/50-vvenc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/fraunhoferhhi/vvenc.git"
-SCRIPT_COMMIT="a1996a8c12593c5ce116243bed7a65dd59489a8d"
+SCRIPT_COMMIT="0e7d4d34b00eedfccc79a3014f9701ae3599dcc0"
 
 ffbuild_enabled() {
     [[ $TARGET != *32 ]] || return -1
@@ -23,7 +23,7 @@ ffbuild_dockerbuild() {
     fi
 
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_SHARED_LIBS=OFF -DEXTRALIBS="-lstdc++" "${armsimd[@]}" ..
+        -DBUILD_SHARED_LIBS=OFF -DVVENC_ENABLE_LINK_TIME_OPT=OFF -DEXTRALIBS="-lstdc++" "${armsimd[@]}" ..
 
     make -j$(nproc)
     make install
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 366210b544..a37db9c977 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/x264.git"
-SCRIPT_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
+SCRIPT_COMMIT="c24e06c2e184345ceb33eb20a15d1024d9fd3497"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index d8ccd066b0..5ca84343cb 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="f6735953b90e4ff74849e20156a520f5bfd410fc"
+SCRIPT_COMMIT="26d2bab0063cee453b7d8012e76539a7786c032f"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index d7bab6b33c..d463816056 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git"
-SCRIPT_COMMIT="71431815950664f1e11b9ee4e5d4ba23d6d997f1"
+SCRIPT_REPO="https://bitbucket.org/the-sekrit-twc/zimg.git"
+SCRIPT_COMMIT="f44905d14c0436959b31fcc70e25ebfeb793e757"
 
 ffbuild_enabled() {
     return 0
diff --git a/util/vars.sh b/util/vars.sh
index 6054578a27..c0c839f7fe 100644
--- a/util/vars.sh
+++ b/util/vars.sh
@@ -73,11 +73,11 @@ ffbuild_dockerstage() {
 }
 
 ffbuild_dockerlayer() {
-    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+    to_df "COPY --link --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
 }
 
 ffbuild_dockerfinal() {
-    to_df "COPY --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+    to_df "COPY --link --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
 }
 
 ffbuild_configure() {