diff --git a/dev-db/postgresql/postgresql11-11.1.recipe b/dev-db/postgresql/postgresql11-11.1.recipe
index ca8a11d7a..4c5196598 100644
--- a/dev-db/postgresql/postgresql11-11.1.recipe
+++ b/dev-db/postgresql/postgresql11-11.1.recipe
@@ -16,7 +16,7 @@ Ruby, Tcl, ODBC, among others, and exceptional documentation."
 HOMEPAGE="https://www.postgresql.org/"
 COPYRIGHT="1996-2018 PostgreSQL Global Development Group"
 LICENSE="PostgreSQL"
-REVISION="7"
+REVISION="8"
 SOURCE_URI="http://ftp.postgresql.org/pub/source/v$portVersion/postgresql-$portVersion.tar.bz2"
 CHECKSUM_SHA256="90815e812874831e9a4bf6e1136bf73bc2c5a0464ef142e2dfea40cda206db08"
 SOURCE_DIR="postgresql-$portVersion"
@@ -151,6 +151,10 @@ BUILD_PREREQUIRES="
 	cmd:touch
 	"
 
+if [ "$targetArchitecture" = riscv64 ]; then
+	spinlocks="--disable-spinlocks"
+fi
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -166,7 +170,8 @@ BUILD()
 		--with-openssl \
 		--with-pam \
 		--with-template=haiku \
-		--disable-thread-safety
+		--disable-thread-safety \
+		$spinlocks
 	make $jobArgs
 }
 
diff --git a/dev-db/postgresql/postgresql12-12.0.recipe b/dev-db/postgresql/postgresql12-12.0.recipe
index c5ffb335d..ba02c5e8f 100644
--- a/dev-db/postgresql/postgresql12-12.0.recipe
+++ b/dev-db/postgresql/postgresql12-12.0.recipe
@@ -20,7 +20,7 @@ you want to build, and let PostgreSQL safely and robustly store your data."
 HOMEPAGE="https://www.postgresql.org/"
 COPYRIGHT="1996-2019 PostgreSQL Global Development Group"
 LICENSE="PostgreSQL"
-REVISION="7"
+REVISION="8"
 SOURCE_URI="http://ftp.postgresql.org/pub/source/v$portVersion/postgresql-$portVersion.tar.bz2"
 CHECKSUM_SHA256="cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6"
 SOURCE_DIR="postgresql-$portVersion"
@@ -162,6 +162,10 @@ BUILD_PREREQUIRES="
 	cmd:touch
 	"
 
+if [ "$targetArchitecture" = riscv64 ]; then
+	spinlocks="--disable-spinlocks"
+fi
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -177,7 +181,8 @@ BUILD()
 		--with-openssl \
 		--with-pam \
 		--with-template=haiku \
-		--disable-thread-safety
+		--disable-thread-safety \
+		$spinlocks
 	make $jobArgs
 }