diff --git a/build/build.sh b/build/build.sh
index ef9197a..3aa2e0e 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -7,6 +7,7 @@ OS=linux
 TIMESTAMP="$(date +%Y%m%d)"
 AOT_BUILD_NEEDED=1
 ILSPYCMD_VERSION="latest"
+CORELIB_ARCHITECTURES=("x86" "x64" "arm" "arm64")
 
 if echo "${VERSION}" | grep -q 'trunk'; then
     VERSION=trunk-"$TIMESTAMP"
@@ -85,6 +86,16 @@ cp -r artifacts/bin/mono/"${OS}".x64.Release/* "${CORE_ROOT_MONO}"
 # Move CORE_ROOT_MONO to CORE_ROOT/mono
 mv "${CORE_ROOT_MONO}" "${CORE_ROOT}"/mono
 
+# Build CoreLib for each architecture
+mkdir "${CORE_ROOT}"/corelib
+
+for ARCH in "${CORELIB_ARCHITECTURES[@]}"; do
+    cd "${DIR}"
+    ./build.sh -s clr.corelib -arch "$ARCH" -c Release
+    mkdir "${CORE_ROOT}"/corelib/"$ARCH"
+    cp -r artifacts/bin/coreclr/linux."$ARCH".Release/IL/* "${CORE_ROOT}"/corelib/"$ARCH"
+done
+
 # Runtime build is done, now build the DisassemblyLoader
 cd "${DIR}"
 ./.dotnet/dotnet build -c Release ../../DisassemblyLoader/DisassemblyLoader.csproj -o "${CORE_ROOT}"/DisassemblyLoader