diff --git a/golang.spec b/golang.spec
index 2e837c1..9b8682d 100644
--- a/golang.spec
+++ b/golang.spec
@@ -1,8 +1,4 @@
-%ifnarch riscv64
 %bcond_with bootstrap
-%else
-%bcond_without bootstrap
-%endif
 # temporalily ignore test failures
 # due to https://github.com/golang/go/issues/39466
 %ifarch aarch64 riscv64
@@ -71,7 +67,7 @@
 %endif
 
 # Build golang shared objects for stdlib
-%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64
+%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 riscv64
 %global shared 1
 %else
 %global shared 0
@@ -125,7 +121,7 @@
  
 Name:           golang
 Version:        %{go_version}
-Release:        %{baserelease}.0.riscv64%{?dist}
+Release:        %{baserelease}.1.riscv64%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -548,6 +544,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 16 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.18.4-1.1.riscv64
+- Disable bootstrap for riscv64 and enable shared
+
 * Sat Jul 23 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.18.4-1.0.riscv64
 - Enable riscv64 (bootstrap)