diff --git a/openssl.spec b/openssl.spec
index 0ac4d64..98a5a9c 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -29,7 +29,7 @@ print(string.sub(hash, 0, 16))
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 3.1.4
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 Epoch: 1
 Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
@@ -262,7 +262,7 @@ sslarch="linux64-mips64 -mips64r2"
 sslflags=enable-ec_nistp_64_gcc_128
 %endif
 %ifarch riscv64
-sslarch=linux-generic64
+sslarch=linux64-riscv64
 %endif
 ktlsopt=enable-ktls
 %ifarch armv7hl
@@ -284,6 +284,9 @@ export HASHBANGPERL=/usr/bin/perl
 # RPM_OPT_FLAGS, so we can skip specifiying them here.
 ./Configure \
 	--prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
+	%ifarch riscv64
+	--libdir=%{_lib} \
+	%endif
 	--system-ciphers-file=%{_sysconfdir}/crypto-policies/back-ends/openssl.config \
 	zlib enable-camellia enable-seed enable-rfc3779 enable-sctp \
 	enable-cms enable-md2 enable-rc5 ${ktlsopt} enable-fips\
@@ -478,6 +481,10 @@ install -m644 %{SOURCE9} \
 %ldconfig_scriptlets libs
 
 %changelog
+* Wed Dec 20 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1:3.1.4-1.0.riscv64
+- Set --libdir for riscv64
+- Switch riscv64 to linux64-riscv64
+
 * Thu Oct 26 2023 Sahana Prasad <sahana@redhat.com> - 1:3.1.4-1
 - Rebase to upstream version 3.1.4