diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 34b8a8b0..10dec9e4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,6 +53,9 @@ jobs:
         - target: aarch64-unknown-linux-gnu
           rust: stable
           os: ubuntu-latest
+        - target: riscv64gc-unknown-linux-gnu
+          rust: stable
+          os: ubuntu-latest
         - target: x86_64-unknown-linux-musl
           rust: stable
           os: ubuntu-latest
diff --git a/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
new file mode 100644
index 00000000..cf6cbf6d
--- /dev/null
+++ b/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
@@ -0,0 +1,12 @@
+FROM ubuntu:18.04
+
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+  ca-certificates \
+  make \
+  perl \
+  gcc \
+  libc6-dev \
+  gcc-riscv64-linux-gnu \
+  libc6-dev-riscv64-cross
+ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER=echo \
+  CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc
diff --git a/src/lib.rs b/src/lib.rs
index 4b904906..5fa19de4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -331,9 +331,9 @@ impl Build {
             "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
             "powerpc64le-alpine-linux-musl" => "linux-ppc64le",
             "riscv64gc-unknown-freebsd" => "BSD-riscv64",
-            "riscv64gc-unknown-linux-gnu" => "linux-generic64",
-            "riscv64gc-unknown-linux-musl" => "linux-generic64",
-            "riscv64-alpine-linux-musl" => "linux-generic64",
+            "riscv64gc-unknown-linux-gnu" => "linux64-riscv64",
+            "riscv64gc-unknown-linux-musl" => "linux64-riscv64",
+            "riscv64-alpine-linux-musl" => "linux64-riscv64",
             "riscv64gc-unknown-netbsd" => "BSD-generic64",
             "s390x-unknown-linux-gnu" => "linux64-s390x",
             "sparc64-unknown-netbsd" => "BSD-generic64",