diff --git a/golang.spec b/golang.spec
index 338b0d2..fee3cfe 100644
--- a/golang.spec
+++ b/golang.spec
@@ -31,14 +31,14 @@
 # Golang build options.
 
 # Build golang using external/internal(close to cgo disabled) linking.
-%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x
+%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x riscv64
 %global external_linker 1
 %else
 %global external_linker 0
 %endif
 
 # Build golang with cgo enabled/disabled(later equals more or less to internal linking).
-%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x
+%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x riscv64
 %global cgo_enabled 1
 %else
 %global cgo_enabled 0
@@ -51,6 +51,12 @@
 %global golang_bootstrap 1
 %endif
 
+%ifarch riscv64
+%bcond_without ignore_tests
+%else
+%bcond_with ignore_tests
+%endif
+
 # Controls what ever we fail on failed tests
 %if %{with ignore_tests}
 %global fail_on_tests 0
@@ -93,6 +99,9 @@
 %ifarch s390x
 %global gohostarch  s390x
 %endif
+%ifarch riscv64
+%global gohostarch  riscv64
+%endif
 
 # Comment out go_prerelease and go_patch as needed
 %global go_api 1.21
@@ -104,7 +113,7 @@
  
 Name:           golang
 Version:        %{go_version}
-Release:        %autorelease
+Release:        %autorelease -e 0.riscv64
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD-3-Clause AND LicenseRef-Fedora-Public-Domain
@@ -455,7 +464,11 @@ export CGO_ENABLED=0
 #endif
 
 # make sure to not timeout
+%ifnarch riscv64
 export GO_TEST_TIMEOUT_SCALE=2
+%else
+export GO_TEST_TIMEOUT_SCALE=20
+%endif
 
 %if %{fail_on_tests}
 ./run.bash --no-rebuild -v -v -v -k