diff --git a/postgresql.spec b/postgresql.spec
index ff118c2..a6c132f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 11
 Version: 11.4
-Release: 1%{?dist}
+Release: 1.0.riscv64%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -422,6 +422,9 @@ export CFLAGS
 # since that's still considered the default plpython version.
 common_configure_options='
 	--disable-rpath
+%ifarch riscv64
+	--disable-spinlocks
+%endif
 %if %beta
 	--enable-debug
 	--enable-cassert
@@ -608,6 +611,9 @@ upgrade_configure ()
 		--host=%{_host} \
 		--prefix=%prev_prefix \
 		--disable-rpath \
+%ifarch riscv64
+		--disable-spinlocks \
+%endif
 %if %beta
 		--enable-debug \
 		--enable-cassert \
@@ -1210,6 +1216,9 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Fri Jul 19 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 11.4-1.0.riscv64
+- Disable spinlocks on RISC-V 64-bit (riscv64)
+
 * Tue Jul 09 2019 Petr Kubat <pkubat@redhat.com> - 11.4-1
 - New upstream version 11.4
   https://www.postgresql.org/docs/11/release-11-4.html