diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
index 96199bcbfa..c6254b0e7c 100644
--- a/src/cmd/dist/build.go
+++ b/src/cmd/dist/build.go
@@ -1762,7 +1762,6 @@ var cgoEnabled = map[string]bool{
 var broken = map[string]bool{
 	"linux/sparc64":   true, // An incomplete port. See CL 132155.
 	"openbsd/mips64":  true, // Broken: go.dev/issue/58110.
-	"openbsd/riscv64": true, // An incomplete port: go.dev/issue/55999.
 }
 
 // List of platforms which are first class ports. See go.dev/issue/38874.
diff --git a/src/internal/platform/zosarch.go b/src/internal/platform/zosarch.go
index 7c3db537e8..af78b4b220 100644
--- a/src/internal/platform/zosarch.go
+++ b/src/internal/platform/zosarch.go
@@ -103,7 +103,7 @@ var distInfo = map[OSArch]osArchInfo{
 	{"openbsd", "arm64"}:   {CgoSupported: true},
 	{"openbsd", "mips64"}:  {CgoSupported: true, Broken: true},
 	{"openbsd", "ppc64"}:   {},
-	{"openbsd", "riscv64"}: {Broken: true},
+	{"openbsd", "riscv64"}: {},
 	{"plan9", "386"}:       {},
 	{"plan9", "amd64"}:     {},
 	{"plan9", "arm"}:       {},