diff --git a/test_crosscompile.sh b/test_crosscompile.sh
index 478bc2e..f0b1dca 100755
--- a/test_crosscompile.sh
+++ b/test_crosscompile.sh
@@ -45,7 +45,6 @@ if ! hash docker; then
     return
 fi
 
-#linux/riscv # Should work once we merge #81.
-#echo2 "Build for linux."
-#echo2 "  - linux/riscv"
-#docker build -t test -f Dockerfile.riscv .
+echo2 "Build for linux."
+echo2 "  - linux/riscv"
+docker build -t test -f Dockerfile.riscv .
diff --git a/ztypes_riscv64.go b/ztypes_riscvx.go
similarity index 84%
rename from ztypes_riscv64.go
rename to ztypes_riscvx.go
index 459bc9a..99eec8e 100644
--- a/ztypes_riscv64.go
+++ b/ztypes_riscvx.go
@@ -1,7 +1,7 @@
 // Code generated by cmd/cgo -godefs; DO NOT EDIT.
 // cgo -godefs types.go
 
-// +build riscv64
+// +build riscv riscv64
 
 package pty