diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile
index e30a4f1e7e7..f8b71c0f2f3 100644
--- a/archivers/py-lz4/Makefile
+++ b/archivers/py-lz4/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	4.0.2
 
 DISTNAME =		lz4-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		archivers
 
@@ -18,16 +18,17 @@ WANTLIB +=		lz4 pthread
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-# MODPY_PYBUILD=setuptools needs work with tests
+MODPY_PYBUILD =		setuptools_scm
 MODPY_PYTEST_ARGS =	--ignore tests/stream
 
 FLAVORS =		python3
 FLAVOR =		python3
 
-BUILD_DEPENDS =		devel/py-pkgconfig${MODPY_FLAVOR} \
-			devel/py-setuptools_scm${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-pkgconfig${MODPY_FLAVOR}
 LIB_DEPENDS =		archivers/lz4
 TEST_DEPENDS =		sysutils/py-psutil${MODPY_FLAVOR}
 
+pre-test:
+	cd ${WRKSRC} && ${MODPY_CMD} build_ext --inplace
+
 .include <bsd.port.mk>
diff --git a/archivers/py-lz4/pkg/PLIST b/archivers/py-lz4/pkg/PLIST
index 37973ae31fa..21a179329d4 100644
--- a/archivers/py-lz4/pkg/PLIST
+++ b/archivers/py-lz4/pkg/PLIST
@@ -1,23 +1,27 @@
 lib/python${MODPY_VERSION}/site-packages/lz4/
-lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/lz4-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/lz4/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lz4/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/lz4/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/lz4/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/lz4/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/lz4/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/lz4/_version.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/lz4/block/
 lib/python${MODPY_VERSION}/site-packages/lz4/block/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lz4/block/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/lz4/block/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/lz4/block/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/lz4/block/_block.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/lz4/frame/
 lib/python${MODPY_VERSION}/site-packages/lz4/frame/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lz4/frame/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/lz4/frame/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/lz4/frame/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/lz4/frame/_frame.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/lz4/version.py