diff --git a/recipes/dev/gcc13/recipe.toml b/recipes/dev/gcc13/recipe.toml
index 928e679a..38dde656 100644
--- a/recipes/dev/gcc13/recipe.toml
+++ b/recipes/dev/gcc13/recipe.toml
@@ -1,5 +1,10 @@
 [source]
 tar = "https://gitlab.redox-os.org/redox-os/gcc/-/archive/redox-13.2.0/gcc-redox-13.2.0.tar.gz"
+script = """
+DYNAMIC_INIT
+COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)"
+cp -fpv "${COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/
+"""
 
 [build]
 template = "custom"
@@ -16,11 +21,6 @@ mkdir -p "${COOKBOOK_SYSROOT}/usr"
 ln -sf "${COOKBOOK_SYSROOT}/include" "${COOKBOOK_SYSROOT}/usr/include"
 ln -sf "${COOKBOOK_SYSROOT}/lib" "${COOKBOOK_SYSROOT}/usr/lib"
 
-pushd "${COOKBOOK_SOURCE}"
-COOKBOOK_AUTORECONF=autoreconf2.69 autotools_recursive_regenerate -I"$(realpath ./config)"
-cp -fpv "${COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux/{config.sub,config.guess,install-sh} libiberty/
-popd # pushd $COOKBOOK_SOURCE
-
 COOKBOOK_CONFIGURE_FLAGS=(
     --host="${GNU_TARGET}"
     --target="${GNU_TARGET}"
@@ -38,11 +38,11 @@ COOKBOOK_CONFIGURE_FLAGS=(
 )
 
 "${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
-"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" all-gcc
-"${COOKBOOK_MAKE}" install-gcc DESTDIR="${COOKBOOK_STAGE}"
+"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" all-gcc all-target-libgcc all-target-libstdc++-v3
+"${COOKBOOK_MAKE}" install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="${COOKBOOK_STAGE}"
 ln -s "gcc" "${COOKBOOK_STAGE}/bin/cc"
 mkdir -p "${COOKBOOK_STAGE}/usr/libexec"
 ln -s "/libexec/gcc" "${COOKBOOK_STAGE}/usr/libexec/gcc"
-# TODO These files should be created in a recipe and added as a dependency for gcc13
-cp -fpv "${COOKBOOK_HOST_SYSROOT}"/lib/gcc/"${GNU_TARGET}"/13.2.0/{*.o,*.a} "${COOKBOOK_STAGE}/lib"
+# Avoid conflict with libgcc & libstdcxx
+rm -f "${COOKBOOK_STAGE}"/lib/libgcc_s.so* "${COOKBOOK_STAGE}"/lib/libstdc++.so*
 """