diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index cd00a00268baf..ca4a01d5322b1 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	geoalchemy2
 PORTVERSION=	0.13.3
+PORTREVISION=	1
 CATEGORIES=	databases geography python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,12 +13,14 @@ WWW=		https://github.com/geoalchemy/geoalchemy2
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING.rst
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.4:databases/py-sqlalchemy14@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-geoalchemy2/files/patch-setup.py b/databases/py-geoalchemy2/files/patch-setup.py
new file mode 100644
index 0000000000000..2e2e4884c6d24
--- /dev/null
+++ b/databases/py-geoalchemy2/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-05-18 09:18:05 UTC
++++ setup.py
+@@ -2,7 +2,7 @@ from setuptools import find_namespace_packages
+ from setuptools import setup
+ 
+ setup(
+-    name="GeoAlchemy2",
++    name="geoalchemy2",
+     use_scm_version=True,
+     description="Using SQLAlchemy with Spatial Databases",
+     long_description=open("README.rst", encoding="utf-8").read(),