diff --git a/dev-db/postgresql/postgresql11-11.1.recipe b/dev-db/postgresql/postgresql11-11.1.recipe
index 12ccda1f8..be5c684e8 100644
--- a/dev-db/postgresql/postgresql11-11.1.recipe
+++ b/dev-db/postgresql/postgresql11-11.1.recipe
@@ -16,13 +16,13 @@ Ruby, Tcl, ODBC, among others, and exceptional documentation."
 HOMEPAGE="https://www.postgresql.org/"
 COPYRIGHT="1996-2018 PostgreSQL Global Development Group"
 LICENSE="PostgreSQL"
-REVISION="5"
+REVISION="6"
 SOURCE_URI="http://ftp.postgresql.org/pub/source/v$portVersion/postgresql-$portVersion.tar.bz2"
 CHECKSUM_SHA256="90815e812874831e9a4bf6e1136bf73bc2c5a0464ef142e2dfea40cda206db08"
 SOURCE_DIR="postgresql-$portVersion"
 PATCHES="postgresql11-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%.*}"
@@ -49,6 +49,9 @@ REQUIRES="
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+CONFLICTS="
+	postgresql$secondaryArchSuffix
+	"
 
 PROVIDES_server="
 	postgresql11${secondaryArchSuffix}_server = $portVersionCompat
@@ -95,7 +98,7 @@ REQUIRES_server="
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
-	lib:libldap_r_2.4$secondaryArchSuffix
+	lib:libldap_2.4$secondaryArchSuffix
 	lib:libpam$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
@@ -119,29 +122,24 @@ REQUIRES_devel="
 	"
 
 CONFLICTS_server="
-	postgresql
 	postgresql$secondaryArchSuffix
-"
+	"
 
 BUILD_REQUIRES="
-	devel:libcrypto$secondaryArchSuffix
-	devel:libicudata$secondaryArchSuffix
-	devel:libicui18n$secondaryArchSuffix
-	devel:libicuuc$secondaryArchSuffix
-	devel:libldap$secondaryArchSuffix
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libicudata$secondaryArchSuffix >= 74
+	devel:libicui18n$secondaryArchSuffix >= 74
+	devel:libicuuc$secondaryArchSuffix >= 74
+	devel:libldap_2.4$secondaryArchSuffix
 	devel:libpam$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:autoheader
 	cmd:awk
 	cmd:bison
 	cmd:flex
@@ -149,7 +147,6 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:m4
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:touch
 	"
@@ -157,19 +154,19 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	libtoolize --force --copy --install
-	autoreconf -i
 
 	touch src/template/haiku # AFAIK it should be empty
 	touch config/missing # shouldn't be required
 
-	CFLAGS=-D_BSD_SOURCE runConfigure ./configure \
+	CFLAGS=-D_BSD_SOURCE LDFLAGS="-lnetwork" runConfigure ./configure \
 		--with-icu \
 		--with-ldap \
 		--with-libxml \
 		--with-libxslt \
 		--with-openssl \
 		--with-pam \
-		--with-template=haiku
+		--with-template=haiku \
+		--disable-thread-safety
 	make $jobArgs
 }
 
diff --git a/dev-db/postgresql/postgresql12-12.0.recipe b/dev-db/postgresql/postgresql12-12.0.recipe
index 52522769f..a794a535e 100644
--- a/dev-db/postgresql/postgresql12-12.0.recipe
+++ b/dev-db/postgresql/postgresql12-12.0.recipe
@@ -20,13 +20,13 @@ 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="5"
+REVISION="6"
 SOURCE_URI="http://ftp.postgresql.org/pub/source/v$portVersion/postgresql-$portVersion.tar.bz2"
 CHECKSUM_SHA256="cda2397215f758b793f741c86be05468257b0e6bcb1a6113882ab5d0df0855c6"
 SOURCE_DIR="postgresql-$portVersion"
 PATCHES="postgresql12-$portVersion.patchset"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 portVersionCompat="$portVersion compat >= ${portVersion%.*}"
@@ -53,6 +53,10 @@ REQUIRES="
 	lib:libxslt$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+CONFLICTS="
+	postgresql$secondaryArchSuffix
+	postgresql11$secondaryArchSuffix
+	"
 
 PROVIDES_server="
 	postgresql12${secondaryArchSuffix}_server = $portVersionCompat
@@ -100,7 +104,7 @@ REQUIRES_server="
 	lib:libicudata$secondaryArchSuffix
 	lib:libicui18n$secondaryArchSuffix
 	lib:libicuuc$secondaryArchSuffix
-	lib:libldap$secondaryArchSuffix
+	lib:libldap_2.4$secondaryArchSuffix
 	lib:libpam$secondaryArchSuffix
 	lib:libpq$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
@@ -129,27 +133,24 @@ REQUIRES_devel="
 CONFLICTS_server="
 	postgresql
 	postgresql$secondaryArchSuffix
+	postgresql11$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libcrypto$secondaryArchSuffix
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix >= 3
 	devel:libicudata$secondaryArchSuffix >= 74
 	devel:libicui18n$secondaryArchSuffix >= 74
 	devel:libicuuc$secondaryArchSuffix >= 74
-	devel:libldap$secondaryArchSuffix
+	devel:libldap_2.4$secondaryArchSuffix
 	devel:libpam$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:autoheader
 	cmd:awk
 	cmd:bison
 	cmd:flex
@@ -157,7 +158,6 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:m4
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:touch
 	"
@@ -165,19 +165,19 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	libtoolize --force --copy --install
-	autoreconf -i
 
 	touch src/template/haiku # AFAIK it should be empty
 	touch config/missing # shouldn't be required
 
-	CFLAGS=-D_BSD_SOURCE runConfigure ./configure \
+	CFLAGS=-D_BSD_SOURCE LDFLAGS="-lnetwork" runConfigure ./configure \
 		--with-icu \
 		--with-ldap \
 		--with-libxml \
 		--with-libxslt \
 		--with-openssl \
 		--with-pam \
-		--with-template=haiku
+		--with-template=haiku \
+		--disable-thread-safety
 	make $jobArgs
 }