diff --git a/sysutils/py-structlog/Makefile b/sysutils/py-structlog/Makefile
index e476a8e04b79..cd73d5cddba0 100644
--- a/sysutils/py-structlog/Makefile
+++ b/sysutils/py-structlog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2022/01/07 17:04:31 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/04/30 11:11:01 wiz Exp $
 
 DISTNAME=	structlog-21.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/structlog/}
 
@@ -10,25 +11,31 @@ HOMEPAGE=	http://www.structlog.org/
 COMMENT=	Painless structural logging
 LICENSE=	apache-2.0 AND mit
 
+BUILD_DEPENDS+=	${PYPKGPREFIX}-flit_core-[0-9]*:../../devel/py-flit_core
 TEST_DEPENDS+=	${PYPKGPREFIX}-freezegun>=0.2.8:../../devel/py-freezegun
 TEST_DEPENDS+=	${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
 TEST_DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-asyncio-[0-9]*:../../devel/py-test-asyncio
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-randomly-[0-9]*:../../devel/py-test-randomly
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-
-PYSETUP=	-c 'from setuptools import setup; setup(name="structlog", version="${PKGVERSION_NOREV}", packages=["structlog"], package_data={"": ["*"]}, package_dir={"": "src"})'
+TEST_DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
+
 .if ${_PYTHON_VERSION} < 38
 DEPENDS+=	${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions
 .endif
 
 USE_LANGUAGES=	# none
 
-PYSETUPTESTTARGET=	pytest
+# needs to be installed first
+# as of 21.5.0
+# 620 passed, 18 skipped, 1 xfailed, 9 warnings, 43 errors
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-structlog/PLIST b/sysutils/py-structlog/PLIST
index 730f75c89f6f..0ce47a68854a 100644
--- a/sysutils/py-structlog/PLIST
+++ b/sysutils/py-structlog/PLIST
@@ -1,60 +1,47 @@
-@comment $NetBSD: PLIST,v 1.5 2022/01/07 17:04:31 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.6 2022/04/30 11:11:01 wiz Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.apache2
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.mit
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
 ${PYSITELIB}/structlog/__init__.py
 ${PYSITELIB}/structlog/__init__.pyc
-${PYSITELIB}/structlog/__init__.pyo
 ${PYSITELIB}/structlog/_base.py
 ${PYSITELIB}/structlog/_base.pyc
-${PYSITELIB}/structlog/_base.pyo
 ${PYSITELIB}/structlog/_config.py
 ${PYSITELIB}/structlog/_config.pyc
-${PYSITELIB}/structlog/_config.pyo
 ${PYSITELIB}/structlog/_frames.py
 ${PYSITELIB}/structlog/_frames.pyc
-${PYSITELIB}/structlog/_frames.pyo
 ${PYSITELIB}/structlog/_generic.py
 ${PYSITELIB}/structlog/_generic.pyc
-${PYSITELIB}/structlog/_generic.pyo
 ${PYSITELIB}/structlog/_greenlets.py
 ${PYSITELIB}/structlog/_greenlets.pyc
-${PYSITELIB}/structlog/_greenlets.pyo
 ${PYSITELIB}/structlog/_log_levels.py
 ${PYSITELIB}/structlog/_log_levels.pyc
-${PYSITELIB}/structlog/_log_levels.pyo
 ${PYSITELIB}/structlog/_loggers.py
 ${PYSITELIB}/structlog/_loggers.pyc
-${PYSITELIB}/structlog/_loggers.pyo
 ${PYSITELIB}/structlog/_utils.py
 ${PYSITELIB}/structlog/_utils.pyc
-${PYSITELIB}/structlog/_utils.pyo
 ${PYSITELIB}/structlog/contextvars.py
 ${PYSITELIB}/structlog/contextvars.pyc
-${PYSITELIB}/structlog/contextvars.pyo
 ${PYSITELIB}/structlog/dev.py
 ${PYSITELIB}/structlog/dev.pyc
-${PYSITELIB}/structlog/dev.pyo
 ${PYSITELIB}/structlog/exceptions.py
 ${PYSITELIB}/structlog/exceptions.pyc
-${PYSITELIB}/structlog/exceptions.pyo
 ${PYSITELIB}/structlog/processors.py
 ${PYSITELIB}/structlog/processors.pyc
-${PYSITELIB}/structlog/processors.pyo
 ${PYSITELIB}/structlog/py.typed
 ${PYSITELIB}/structlog/stdlib.py
 ${PYSITELIB}/structlog/stdlib.pyc
-${PYSITELIB}/structlog/stdlib.pyo
 ${PYSITELIB}/structlog/testing.py
 ${PYSITELIB}/structlog/testing.pyc
-${PYSITELIB}/structlog/testing.pyo
 ${PYSITELIB}/structlog/threadlocal.py
 ${PYSITELIB}/structlog/threadlocal.pyc
-${PYSITELIB}/structlog/threadlocal.pyo
 ${PYSITELIB}/structlog/twisted.py
 ${PYSITELIB}/structlog/twisted.pyc
-${PYSITELIB}/structlog/twisted.pyo
 ${PYSITELIB}/structlog/types.py
 ${PYSITELIB}/structlog/types.pyc
-${PYSITELIB}/structlog/types.pyo