diff --git a/databases/py-pg8000/Makefile b/databases/py-pg8000/Makefile
index e2e0570fc875..056f98da4cc0 100644
--- a/databases/py-pg8000/Makefile
+++ b/databases/py-pg8000/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	pg8000
-PORTVERSION=	1.30.5
+PORTVERSION=	1.31.1
 CATEGORIES=	databases python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pure-Python Interface to the PostgreSQL Database
 WWW=		https://github.com/tlocke/pg8000
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch>=0:devel/py-hatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}versioningit>=2.1.0:devel/py-versioningit@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}versioningit>=3.1.0:devel/py-versioningit@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.2:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scramp>=1.4.4:security/py-scramp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.0:devel/py-asn1crypto@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pg8000-112 # lib/python3.8/site-packages/pg8000/__init__.py
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/py-pg8000/distinfo b/databases/py-pg8000/distinfo
index f07b7b957a82..a6e0c8a64231 100644
--- a/databases/py-pg8000/distinfo
+++ b/databases/py-pg8000/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708675572
-SHA256 (pg8000-1.30.5.tar.gz) = 072f7ad00cd723695cb2e9fc02c1dfb84c781455e97b8de6f4c4281eea08078c
-SIZE (pg8000-1.30.5.tar.gz) = 109772
+TIMESTAMP = 1712623264
+SHA256 (pg8000-1.31.1.tar.gz) = b11130d4c615dd3062ea8fed8143064a7978b7fe6d44f14b72261d43c8e27087
+SIZE (pg8000-1.31.1.tar.gz) = 112923
diff --git a/databases/py-pg8000/files/patch-pyproject.toml b/databases/py-pg8000/files/patch-pyproject.toml
deleted file mode 100644
index 713a49510a74..000000000000
--- a/databases/py-pg8000/files/patch-pyproject.toml
+++ /dev/null
@@ -1,10 +0,0 @@
---- pyproject.toml.orig	2024-01-14 09:52:53 UTC
-+++ pyproject.toml
-@@ -1,6 +1,6 @@ requires = [
- [build-system]
- requires = [
--    "setuptools >= 65",
-+    "setuptools >= 63",
-     "versioningit >= 2.1.0",
- ]
- build-backend = "setuptools.build_meta"