diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14d51b5b2..0262f5fec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,6 +28,21 @@ jobs:
           - artifact: arm64-linux
             os: ubuntu-22.04-arm
 
+          - artifact: riscv64-linux
+            os: ubuntu-24.04
+            rust_target: riscv64gc-unknown-linux-gnu
+            cross_cmake_args: >-
+              -DCMAKE_SYSTEM_NAME=Linux
+              -DCMAKE_SYSTEM_PROCESSOR=riscv64
+              -DCMAKE_C_COMPILER=riscv64-linux-gnu-gcc
+              -DCMAKE_CXX_COMPILER=riscv64-linux-gnu-g++
+              -DWASI_SDK_LLDB=OFF
+            env:
+              WASI_SDK_CI_SKIP_SYSROOT: 1
+              WASI_SDK_CI_TOOLCHAIN_LLVM_CMAKE_ARGS: >-
+                -DCMAKE_SYSTEM_NAME=Linux
+                -DCMAKE_SYSTEM_PROCESSOR=riscv64
+
           - artifact: arm64-macos
             os: macos-14
             rust_target: aarch64-apple-darwin
@@ -85,6 +100,9 @@ jobs:
             rustup target add ${{ matrix.rust_target }}
             cmake_args="$cmake_args -DRUST_TARGET=${{ matrix.rust_target }}"
           fi
+          if [ "${{ matrix.cross_cmake_args }}" != "" ]; then
+            cmake_args="$cmake_args ${{ matrix.cross_cmake_args }}"
+          fi
           echo WASI_SDK_CI_TOOLCHAIN_CMAKE_ARGS="$cmake_args" >> $GITHUB_ENV
         shell: bash
 
diff --git a/ci/docker-build.sh b/ci/docker-build.sh
index 7773f7980..2915e286c 100755
--- a/ci/docker-build.sh
+++ b/ci/docker-build.sh
@@ -15,8 +15,13 @@ fi
 
 set -x
 
-# Build the Docker imager
-docker build --tag wasi-sdk-builder ci/docker
+# Build the Docker image. Use an artifact-specific Dockerfile if one exists
+# (e.g. ci/docker/Dockerfile.riscv64-linux), otherwise use the default.
+dockerfile=ci/docker/Dockerfile
+if [ -f "ci/docker/Dockerfile.$1" ]; then
+  dockerfile="ci/docker/Dockerfile.$1"
+fi
+docker build --tag wasi-sdk-builder --file "$dockerfile" ci/docker
 
 # Perform the build in `/src`. The current directory is mounted read-write at
 # this location as well. To ensure that container-created files are reasonable
@@ -34,9 +39,11 @@ args="$args --volume $ccache_dir:/ccache:Z --env CCACHE_DIR=/ccache"
 
 # Inherit some tools from the host into this container. This ensures that the
 # decision made on CI of what versions to use is the canonical source of truth
-# for theset ools
+# for these tools.
 args="$args --volume `rustc --print sysroot`:/rustc:ro"
-args="$args --volume $(dirname $(which wasmtime)):/wasmtime:ro"
+if [ "${WASI_SDK_CI_SKIP_SYSROOT:-}" != "1" ]; then
+  args="$args --volume $(dirname $(command -v wasmtime)):/wasmtime:ro"
+fi
 
 # Pass through some env vars that `build.sh` reads
 args="$args --env WASI_SDK_CI_TOOLCHAIN_CMAKE_ARGS"
diff --git a/ci/docker/Dockerfile.riscv64-linux b/ci/docker/Dockerfile.riscv64-linux
new file mode 100644
index 000000000..f4456ecf7
--- /dev/null
+++ b/ci/docker/Dockerfile.riscv64-linux
@@ -0,0 +1,28 @@
+# Ubuntu 24.04 is used here (rather than AlmaLinux 8) because it has
+# riscv64 cross-compilation packages in its repositories.
+FROM ubuntu:24.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  curl \
+  ca-certificates \
+  crossbuild-essential-riscv64 \
+  clang \
+  lld \
+  python3 \
+  git \
+  unzip \
+  cmake \
+  ninja-build \
+  ccache \
+  && rm -rf /var/lib/apt/lists/*
+
+# Cargo needs an explicit linker when cross-compiling for riscv64.
+# The C/C++ cross-compiler is passed via CMAKE_C/CXX_COMPILER cmake flags
+# rather than CC/CXX env vars so that LLVM's native tblgen sub-build can
+# still find the host compiler (cmake cache vars are not inherited by
+# subprocess cmake invocations, but env vars are).
+ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc
+
+# Tell programs to cache in a location that both isn't a `--volume` mounted root
+# and isn't `/root` in the container as that won't be writable during the build.
+ENV XDG_CACHE_HOME=/tmp/cache
diff --git a/ci/merge-artifacts.sh b/ci/merge-artifacts.sh
index e64b68e85..9a1e68386 100755
--- a/ci/merge-artifacts.sh
+++ b/ci/merge-artifacts.sh
@@ -21,8 +21,9 @@ make_deb() {
   fi
 
   case $build in
-    dist-x86_64-linux) deb_arch=amd64 ;;
-    dist-arm64-linux)  deb_arch=arm64 ;;
+    dist-x86_64-linux)  deb_arch=amd64   ;;
+    dist-arm64-linux)   deb_arch=arm64   ;;
+    dist-riscv64-linux) deb_arch=riscv64 ;;
     *)
       echo "unknown build $build"
       exit 1