diff --git a/audio/rgain/Makefile b/audio/rgain/Makefile
index b84eab51efa..d72809ceb2d 100644
--- a/audio/rgain/Makefile
+++ b/audio/rgain/Makefile
@@ -3,7 +3,7 @@ COMMENT=	multi-format tools and Python module for ReplayGain
 MODPY_EGG_VERSION= 1.1.1
 DISTNAME=	rgain3-${MODPY_EGG_VERSION}
 EPOCH=		0
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	audio
 
@@ -13,7 +13,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=	lang/python
 
 MODPY_PI=	Yes
-MODPY_PYTEST=	Yes
+MODPY_PYBUILD=	setuptools
 
 BUILD_DEPENDS=	textproc/py-docutils${MODPY_FLAVOR}
 
@@ -24,7 +24,6 @@ RUN_DEPENDS=	audio/py-mutagen${MODPY_FLAVOR} \
 		multimedia/gstreamer1/plugins-base \
 		multimedia/gstreamer1/plugins-good
 
-TEST_DEPENDS=	${BASE_PKGPATH} \
-		devel/py-test-cov${MODPY_FLAVOR}
+TEST_DEPENDS=	devel/py-test-cov${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/audio/rgain/pkg/PLIST b/audio/rgain/pkg/PLIST
index 1a7e72fc1dd..6311dc6e4ca 100644
--- a/audio/rgain/pkg/PLIST
+++ b/audio/rgain/pkg/PLIST
@@ -2,14 +2,25 @@
 bin/collectiongain
 bin/replaygain
 lib/python${MODPY_VERSION}/site-packages/rgain3/
-lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}.dist-info/COPYING
+lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/rgain3-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/rgain3/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}albumid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}albumid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}rgcalc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}rgcalc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}rgio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}rgio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rgain3/albumid.py
 lib/python${MODPY_VERSION}/site-packages/rgain3/rgcalc.py
@@ -17,8 +28,11 @@ lib/python${MODPY_VERSION}/site-packages/rgain3/rgio.py
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}collectiongain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}collectiongain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}replaygain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/${MODPY_PYCACHE}replaygain.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/collectiongain.py
 lib/python${MODPY_VERSION}/site-packages/rgain3/script/replaygain.py