diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index c36c1caebbdc..a870868e6628 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2023/05/05 09:02:12 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2023/07/01 11:29:20 wiz Exp $
 
-DISTNAME=	service-identity-21.1.0
-# to match previous pkgsrc name
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-/_/}
+DISTNAME=	service_identity-23.1.0
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/service_identity/}
 
@@ -11,6 +9,9 @@ HOMEPAGE=	https://pypi.python.org/pypi/service_identity
 COMMENT=	Service identity verification for pyOpenSSL
 LICENSE=	mit
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-hatchling-[0-9]*:../../devel/py-hatchling
+TOOL_DEPENDS+=	${PYPKGPREFIX}-hatch-vcs-[0-9]*:../../devel/py-hatch-vcs
+TOOL_DEPENDS+=	${PYPKGPREFIX}-hatch-fancy-pypi-readme-[0-9]*:../../devel/py-hatch-fancy-pypi-readme
 DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-asn1-modules-[0-9]*:../../security/py-asn1-modules
 DEPENDS+=	${PYPKGPREFIX}-attrs>=19.1.0:../../devel/py-attrs
@@ -19,13 +20,13 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-idna-[0-9]*:../../www/py-idna
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27
+PYTHON_VERSIONS_INCOMPATIBLE=	27 37
 
-TEST_ENV+=	PYTHONPATH=${WRKSRC}/build/lib
+# needs 'make install'
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 PYTHON_VERSIONED_DEPENDENCIES+=	cryptography
 PYTHON_VERSIONED_DEPENDENCIES+=	OpenSSL
 .include "../../lang/python/versioned_dependencies.mk"
diff --git a/security/py-service_identity/PLIST b/security/py-service_identity/PLIST
index fcf03439e2fa..00740a232b04 100644
--- a/security/py-service_identity/PLIST
+++ b/security/py-service_identity/PLIST
@@ -1,25 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2017/05/29 11:22:51 wiz Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.4 2023/07/01 11:29:20 wiz Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
 ${PYSITELIB}/service_identity/__init__.py
 ${PYSITELIB}/service_identity/__init__.pyc
-${PYSITELIB}/service_identity/__init__.pyo
-${PYSITELIB}/service_identity/_common.py
-${PYSITELIB}/service_identity/_common.pyc
-${PYSITELIB}/service_identity/_common.pyo
-${PYSITELIB}/service_identity/_compat.py
-${PYSITELIB}/service_identity/_compat.pyc
-${PYSITELIB}/service_identity/_compat.pyo
 ${PYSITELIB}/service_identity/cryptography.py
 ${PYSITELIB}/service_identity/cryptography.pyc
-${PYSITELIB}/service_identity/cryptography.pyo
 ${PYSITELIB}/service_identity/exceptions.py
 ${PYSITELIB}/service_identity/exceptions.pyc
-${PYSITELIB}/service_identity/exceptions.pyo
+${PYSITELIB}/service_identity/hazmat.py
+${PYSITELIB}/service_identity/hazmat.pyc
+${PYSITELIB}/service_identity/py.typed
 ${PYSITELIB}/service_identity/pyopenssl.py
 ${PYSITELIB}/service_identity/pyopenssl.pyc
-${PYSITELIB}/service_identity/pyopenssl.pyo
diff --git a/security/py-service_identity/distinfo b/security/py-service_identity/distinfo
index 9016842676dd..72562b0e84f0 100644
--- a/security/py-service_identity/distinfo
+++ b/security/py-service_identity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2023/05/05 09:02:12 wiz Exp $
+$NetBSD: distinfo,v 1.9 2023/07/01 11:29:20 wiz Exp $
 
-BLAKE2s (service-identity-21.1.0.tar.gz) = 54b28202f38c671a05437e055a5f3605ff7d247f4780fb56bbc0cb56837636cc
-SHA512 (service-identity-21.1.0.tar.gz) = 36a6f7cb30871bd38da865521503c622a70318f8c5cdc74b0565bdc292bb3b84682bf3afe050d007b21f27d0c54ba0bfe1cd71b63fb13fa42cbaef66cb115c2b
-Size (service-identity-21.1.0.tar.gz) = 40073 bytes
+BLAKE2s (service_identity-23.1.0.tar.gz) = b484afc1fcc1f6c280d43231d3c3c3aa40dfb286b39f17cd70a11957ddd18939
+SHA512 (service_identity-23.1.0.tar.gz) = bc53f563050811a2b40dbfcf1e0a1b1b5677e2b48ed4e94e37d29735baea49ed7a7099d656444c0054fa2c23ae96026e67919cf24b01a3ae6b3549fd25dfe4d1
+Size (service_identity-23.1.0.tar.gz) = 39840 bytes