diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 3ca4a0bfa497..aecced016939 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -1,59 +1,61 @@
 PORTNAME=	mysql-connector-c++
-PORTVERSION=	8.0.33
-PORTREVISION=	12
+DISTVERSION=	9.4.0
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-C++
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL database connector for C++
 WWW=		https://dev.mysql.com/doc/relnotes/connector-cpp/en/index.html
 
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		liblz4.so:archivers/liblz4 \
 		libprotobuf.so:devel/protobuf \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:noninja compiler:c++17-lang cpe gmake mysql ssl
 IGNORE_WITH_MYSQL=	105m 106m 1011m
 CPE_VENDOR=	oracle
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_ENABLE_C++17=ON \
 		-DWITH_LZ4=system \
 		-DWITH_PROTOBUF=system \
 		-DWITH_SYSTEM_LIBS=1 \
 		-DWITH_ZLIB=system \
 		-DWITH_ZSTD=system
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${DISTVERSION}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS JDBC
 OPTIONS_DEFAULT=	JDBC
 OPTIONS_SUB=	yes
 
 JDBC_DESC=	Build  JDBC Interface
 
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CMAKE_ON=		-DDOC_DESTINATION="${DOCSDIR}" \
 			-DWITH_DOC=ON
 JDBC_LIB_DEPENDS=	libunwind.so:devel/libunwind
 JDBC_CMAKE_ON=		-DWITH_JDBC=ON
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/INFO_BIN
 	@${RM} ${STAGEDIR}${PREFIX}/INFO_SRC
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake
+	@${MV} ${STAGEDIR}${PREFIX}/mysql-*.cmake \
+		${STAGEDIR}${PREFIX}/lib/cmake/
 
 post-install-DOCS-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
 		${STAGEDIR}${DOCSDIR}/LICENSE.txt
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${BUILD_WRKSRC}/doc && \
 		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index 07e02a50bd6e..a8150b9cf430 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688279127
-SHA256 (mysql-connector-c++-8.0.33-src.tar.gz) = 160cf6881fbde9bd46cd11aaf12930b676bc6e27589ac5c7ba49c196b97e053b
-SIZE (mysql-connector-c++-8.0.33-src.tar.gz) = 4531693
+TIMESTAMP = 1753568390
+SHA256 (mysql-connector-c++-9.4.0-src.tar.gz) = 36a7c93d4a10d1da2a2e66367559d91741aa0f0362bc0ae943171cf1771f6615
+SIZE (mysql-connector-c++-9.4.0-src.tar.gz) = 4788987
diff --git a/databases/mysql-connector-c++/pkg-plist b/databases/mysql-connector-c++/pkg-plist
index 0871a6f066b6..f3b0d695718f 100644
--- a/databases/mysql-connector-c++/pkg-plist
+++ b/databases/mysql-connector-c++/pkg-plist
@@ -1,57 +1,59 @@
 %%JDBC%%include/jdbc/cppconn/build_config.h
 %%JDBC%%include/jdbc/cppconn/callback.h
 %%JDBC%%include/jdbc/cppconn/config.h
 %%JDBC%%include/jdbc/cppconn/connection.h
 %%JDBC%%include/jdbc/cppconn/datatype.h
 %%JDBC%%include/jdbc/cppconn/driver.h
 %%JDBC%%include/jdbc/cppconn/exception.h
 %%JDBC%%include/jdbc/cppconn/metadata.h
 %%JDBC%%include/jdbc/cppconn/parameter_metadata.h
 %%JDBC%%include/jdbc/cppconn/prepared_statement.h
 %%JDBC%%include/jdbc/cppconn/resultset.h
 %%JDBC%%include/jdbc/cppconn/resultset_metadata.h
 %%JDBC%%include/jdbc/cppconn/sqlstring.h
 %%JDBC%%include/jdbc/cppconn/statement.h
 %%JDBC%%include/jdbc/cppconn/variant.h
 %%JDBC%%include/jdbc/cppconn/version_info.h
 %%JDBC%%include/jdbc/cppconn/warning.h
 %%JDBC%%include/jdbc/mysql_connection.h
 %%JDBC%%include/jdbc/mysql_driver.h
 %%JDBC%%include/jdbc/mysql_error.h
 %%JDBC%%include/mysql/jdbc.h
 include/mysqlx/common.h
 include/mysqlx/common/api.h
 include/mysqlx/common/error.h
 include/mysqlx/common/op_if.h
 include/mysqlx/common/settings.h
 include/mysqlx/common/util.h
 include/mysqlx/common/value.h
 include/mysqlx/common_constants.h
 include/mysqlx/devapi/collations.h
 include/mysqlx/devapi/collection_crud.h
 include/mysqlx/devapi/common.h
 include/mysqlx/devapi/crud.h
 include/mysqlx/devapi/detail/crud.h
 include/mysqlx/devapi/detail/error.h
 include/mysqlx/devapi/detail/result.h
 include/mysqlx/devapi/detail/row.h
 include/mysqlx/devapi/detail/session.h
 include/mysqlx/devapi/detail/settings.h
 include/mysqlx/devapi/document.h
 include/mysqlx/devapi/error.h
 include/mysqlx/devapi/executable.h
 include/mysqlx/devapi/mysql_charsets.h
 include/mysqlx/devapi/mysql_collations.h
 include/mysqlx/devapi/result.h
 include/mysqlx/devapi/row.h
 include/mysqlx/devapi/settings.h
 include/mysqlx/devapi/table_crud.h
 include/mysqlx/version_info.h
 include/mysqlx/xapi.h
 include/mysqlx/xdevapi.h
 %%JDBC%%lib/libmysqlcppconn.so
-%%JDBC%%lib/libmysqlcppconn.so.9
-%%JDBC%%lib/libmysqlcppconn.so.9.%%PORTVERSION%%
-lib/libmysqlcppconn8.so
-lib/libmysqlcppconn8.so.2
-lib/libmysqlcppconn8.so.2.%%PORTVERSION%%
+%%JDBC%%lib/libmysqlcppconn.so.10
+%%JDBC%%lib/libmysqlcppconn.so.10.%%PORTVERSION%%
+lib/cmake/mysql-concpp-config-version.cmake
+lib/cmake/mysql-concpp-config.cmake
+lib/libmysqlcppconnx.so
+lib/libmysqlcppconnx.so.2
+lib/libmysqlcppconnx.so.2.%%PORTVERSION%%