diff --git a/.cargo/config b/.cargo/config
index cc387d318756b2a38b69e0a9ae59f63fc52d12da..f9f6b985a8710e9ba86881da55989ebde13f771a 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,3 +1,3 @@
 [target.x86_64-unknown-redox]
-linker = "x86_64-elf-redox-gcc"
+linker = "libc-artifacts/gcc.sh"
 rustflags = []
diff --git a/.gitmodules b/.gitmodules
index 4f9444d73b9aef4df8900311df29051922ab6228..c335c458cd092534868e0daeec8ed16408f2f943 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,8 @@
+[submodule "libc-artifacts"]
+	path = libc-artifacts
+	url = https://github.com/redox-os/libc-artifacts.git
+	branch = master
 [submodule "pkgutils"]
 	path = pkgutils
 	url = https://github.com/redox-os/pkgutils.git
+	branch = master
diff --git a/config.sh b/config.sh
index 724ae9c82bddf1c7677dd73fe86ba99714c91e41..89c5987a3c445ecfc7d0624465921a2eda176303 100755
--- a/config.sh
+++ b/config.sh
@@ -7,5 +7,5 @@ export TARGET=x86_64-unknown-redox
 # Automatic variables
 ROOT="$(cd `dirname "$0"` && pwd)"
 REPO="$ROOT/repo/$TARGET"
-export CC="x86_64-elf-redox-gcc"
+export CC="$ROOT/libc-artifacts/gcc.sh"
 export XARGO_HOME="$ROOT/xargo-home"
diff --git a/libc-artifacts b/libc-artifacts
new file mode 160000
index 0000000000000000000000000000000000000000..c67b055af98c5f9d3afbe62479e8201f01f941cc
--- /dev/null
+++ b/libc-artifacts
@@ -0,0 +1 @@
+Subproject commit c67b055af98c5f9d3afbe62479e8201f01f941cc
diff --git a/pkgutils b/pkgutils
index 9b212cd5c2c14e5dcbb6fc2e6d5bea59e329a76d..0c3769fd4ecf17fb9b47ee800e80b92162628e90 160000
--- a/pkgutils
+++ b/pkgutils
@@ -1 +1 @@
-Subproject commit 9b212cd5c2c14e5dcbb6fc2e6d5bea59e329a76d
+Subproject commit 0c3769fd4ecf17fb9b47ee800e80b92162628e90
diff --git a/setup.sh b/setup.sh
index bb8e5218e02948498e10e147946c30de3a9c21d6..9f30c1d751a7f1687027545cf1e7a5506cd77fdf 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
+echo "Downloading latest libc-artifacts"
+git submodule update --init --remote libc-artifacts
+
 echo "Downloading latest pkgutils"
 git submodule update --init --remote pkgutils
 cargo update --manifest-path pkgutils/Cargo.toml