diff --git a/Dockerfile.build b/Dockerfile.build
index 28394ee..577ad68 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -18,6 +18,7 @@ RUN set -eux; \
 		libc6-dev-i386-cross \
 		libc6-dev-mips64el-cross \
 		libc6-dev-ppc64el-cross \
+		libc6-dev-riscv64-cross \
 		libc6-dev-s390x-cross \
 		\
 		gcc-aarch64-linux-gnu \
@@ -26,6 +27,7 @@ RUN set -eux; \
 		gcc-i686-linux-gnu \
 		gcc-mips64el-linux-gnuabi64 \
 		gcc-powerpc64le-linux-gnu \
+		gcc-riscv64-linux-gnu \
 		gcc-s390x-linux-gnu \
 		\
 		file \
@@ -87,6 +89,11 @@ RUN set -ex; \
 		CROSS_COMPILE='powerpc64le-linux-gnu-' \
 		CFLAGS+='-mlong-double-64'
 
+RUN set -ex; \
+	make clean all \
+		TARGET_ARCH='riscv64' \
+		CROSS_COMPILE='riscv64-linux-gnu-'
+
 RUN set -ex; \
 	make clean all \
 		TARGET_ARCH='s390x' \
diff --git a/riscv64/hello-world/Dockerfile b/riscv64/hello-world/Dockerfile
new file mode 100644
index 0000000..d4ff707
--- /dev/null
+++ b/riscv64/hello-world/Dockerfile
@@ -0,0 +1,3 @@
+FROM scratch
+COPY hello /
+CMD ["/hello"]
diff --git a/riscv64/hello-world/hello b/riscv64/hello-world/hello
new file mode 100755
index 0000000..9fe183d
Binary files /dev/null and b/riscv64/hello-world/hello differ