diff --git a/Data/MySQL/MySQL.make b/Data/MySQL/MySQL.make
index 7017290f0..acf97243f 100644
--- a/Data/MySQL/MySQL.make
+++ b/Data/MySQL/MySQL.make
@@ -4,20 +4,37 @@
 # Makefile fragment for finding MySQL library
 #
 
+ifndef POCO_MYSQL_INCLUDE
+ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/include
+else
+ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include; echo $$?))
+POCO_MYSQL_INCLUDE = /usr/local/opt/mysql-client/include
+else
+ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/include; echo $$?))
+POCO_MYSQL_INCLUDE = /opt/homebrew/opt/mysql-client/include
+endif
+endif
+endif
+endif
 
-# Note: linking order is important, do not change it.
+ifndef POCO_MYSQL_LIB
+ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
+POCO_MYSQL_LIB = /usr/local/lib
+else
+ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?))
+POCO_MYSQL_LIB = /usr/local/opt/mysql-client/lib
+else
+ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/lib; echo $$?))
+POCO_MYSQL_LIB = /opt/homebrew/opt/mysql-client/lib
+endif
+endif
+endif
+endif
 
 ifdef POCO_MYSQL_INCLUDE
 INCLUDE += -I$(POCO_MYSQL_INCLUDE)
-else
-INCLUDE += -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I/usr/local/opt/mysql-client/include -I/usr/local/opt/mysql-client/include/mysql  
 endif
-
 ifdef POCO_MYSQL_LIB
 SYSLIBS += -L$(POCO_MYSQL_LIB)
-else
-SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -L/usr/local/opt/mysql-client/lib
 endif
-
-# Note: linking order is important, do not change it.
-SYSLIBS += -lmysqlclient -lz -lpthread -ldl
diff --git a/Data/PostgreSQL/PostgreSQL.make b/Data/PostgreSQL/PostgreSQL.make
index 7b9248b24..b3582c672 100644
--- a/Data/PostgreSQL/PostgreSQL.make
+++ b/Data/PostgreSQL/PostgreSQL.make
@@ -20,6 +20,9 @@ endif
 ifeq (0, $(shell test -e /usr/local/opt/libpq/include; echo $$?))
 INCLUDE += -I/usr/local/opt/libpq/include
 endif
+ifeq (0, $(shell test -e /opt/homebrew/opt/libpq/include; echo $$?))
+INCLUDE += -I/opt/homebrew/opt/libpq/include
+endif
 endif
 
 ifndef POCO_PGSQL_LIB
@@ -41,6 +44,9 @@ endif
 ifeq (0, $(shell test -e /usr/local/opt/libpq/lib; echo $$?))
 SYSLIBS += -L/usr/local/opt/libpq/lib$(LIB64SUFFIX)
 endif
+ifeq (0, $(shell test -e /opt/homebrew/opt/libpq/lib; echo $$?))
+SYSLIBS += -L/opt/homebrew/opt/libpq/lib$(LIB64SUFFIX)
+endif
 endif
 SYSLIBS += -lpq
 
diff --git a/build/config/Darwin-clang-libc++ b/build/config/Darwin-clang-libc++
index 94b316ba4..fc32971ac 100644
--- a/build/config/Darwin-clang-libc++
+++ b/build/config/Darwin-clang-libc++
@@ -11,11 +11,15 @@
 #
 LINKMODE ?= SHARED
 
-ARCHFLAGS          ?= -arch $(OSARCH)
+ARCHFLAGS          ?= -arch $(POCO_HOST_OSARCH)
 SANITIZEFLAGS      ?=
 OSFLAGS            ?= -mmacosx-version-min=10.11 -isysroot $(shell xcrun --show-sdk-path)
 
+ifeq ($(POCO_HOST_OSARCH),arm64)
+OPENSSL_DIR        ?= /opt/homebrew/opt/openssl
+else
 OPENSSL_DIR        ?= /usr/local/opt/openssl
+endif
 
 #
 # Tools