diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 2b492708a603..df1d19a8aa72 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	twisted
-PORTVERSION=	22.10.0
-PORTREVISION=	1
+PORTVERSION=	23.8.0
 CATEGORIES=	devel net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Twisted-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Asynchronous networking framework written in Python
-WWW=		https://twistedmatrix.com/
+WWW=		https://twistedmatrix.com/ \
+		https://github.com/twisted/twisted
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}incremental>=21.3.0:devel/py-incremental@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch-fancy-pypi-readme>=22.5.0:devel/py-hatch-fancy-pypi-readme@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hatchling>=1.10.0:devel/py-hatchling@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}incremental>=21.3.0:devel/py-incremental@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=21.3.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Automat>=0.8.0:devel/py-Automat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}incremental>=21.3.0:devel/py-incremental@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.5:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.4.2:devel/py-zope.interface@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0:devel/py-typing-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=5:devel/py-zope.interface@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython-test-exception-raiser>=1.0.2<2:devel/py-cython-test-exception-raiser@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}PyHamcrest>=1.9.0:textproc/py-pyhamcrest@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}hypothesis>=6.56:devel/py-hypothesis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}PyHamcrest>=2:textproc/py-pyhamcrest@${PY_FLAVOR}
 
-USES=		cpe python:3.8-3.10
-USE_PYTHON=	autoplist concurrent distutils
+USES=		cpe python
+USE_PYTHON=	autoplist concurrent pep517
 
 CPE_VENDOR=	twistedmatrix
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	CONCH HTTP2 SERIAL TLS
 OPTIONS_DEFAULT=CONCH HTTP2 SERIAL TLS
 CONCH_DESC=	Conch secure shell SSH
 SERIAL_DESC=	Serial port extension
 
 CONCH_USES=		pycryptography:run
 CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}bcrypt>=3.0.0:security/py-bcrypt@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.3:security/py-bcrypt@${PY_FLAVOR}
 HTTP2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}h2>=3.0<5.0:www/py-h2@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}priority1>=1.1.0<2.0:www/py-priority1@${PY_FLAVOR}
 SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR}
 TLS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}openssl>=21.0.0,1:security/py-openssl@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}service_identity>=18.1.0:security/py-service_identity@${PY_FLAVOR}
 
 # We need twisted.trial in PYTHONPATH
 # twisted.conch tests depend on finding certain scripts in PATH
 TEST_ENV=	PYTHONPATH=${WRKSRC}/src PATH=${STAGEDIR}/${PREFIX}/bin:$$PATH
 
 post-patch:
 	${GREP} -F -Rl TLS_METHOD ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		-e 's,TLS_METHOD,TLSv1_2_METHOD,'
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m twisted.trial -e twisted
 
 .include <bsd.port.mk>
diff --git a/devel/py-twisted/distinfo b/devel/py-twisted/distinfo
index 5868c99b57a2..5545084b2285 100644
--- a/devel/py-twisted/distinfo
+++ b/devel/py-twisted/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669549098
-SHA256 (Twisted-22.10.0.tar.gz) = 32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
-SIZE (Twisted-22.10.0.tar.gz) = 3524935
+TIMESTAMP = 1693987497
+SHA256 (twisted-23.8.0.tar.gz) = 3c73360add17336a622c0d811c2a2ce29866b6e59b1125fd6509b17252098a24
+SIZE (twisted-23.8.0.tar.gz) = 3478691
diff --git a/devel/py-twisted/files/patch-pyproject.toml b/devel/py-twisted/files/patch-pyproject.toml
new file mode 100644
index 000000000000..4fe5a29a6b2f
--- /dev/null
+++ b/devel/py-twisted/files/patch-pyproject.toml
@@ -0,0 +1,20 @@
+--- pyproject.toml.orig	2020-02-02 00:00:00 UTC
++++ pyproject.toml
+@@ -2,7 +2,7 @@
+ requires = [
+     "hatchling >= 1.10.0",
+     "hatch-fancy-pypi-readme >= 22.5.0",
+-    "incremental >= 22.10.0",
++    "incremental >= 21.3.0",
+ ]
+ build-backend = "hatchling.build"
+ 
+@@ -34,7 +34,7 @@ classifiers = [
+ dependencies = [
+     "zope.interface >= 5",
+     "constantly >= 15.1",
+-    "incremental >= 22.10.0",
++    "incremental >= 21.3.0",
+     "Automat >= 0.8.0",
+     "hyperlink >= 17.1.1",
+     "attrs >= 21.3.0",