diff --git a/audio/py-musicbrainz2/Makefile b/audio/py-musicbrainz2/Makefile
index ee88cf382a24..ee86fbf9458a 100644
--- a/audio/py-musicbrainz2/Makefile
+++ b/audio/py-musicbrainz2/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	python-musicbrainz2-${DISTVERSION}
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Next Generation Python bindings for MusicBrainz
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	yes
+USES=		python:2
+PYTHON_FEATURES=	autoplist distutils
 PYDISTUTILS_PKGNAME=	python-musicbrainz2
 
 .include <bsd.port.mk>
diff --git a/audio/py-musicbrainz2/pkg-plist b/audio/py-musicbrainz2/pkg-plist
deleted file mode 100644
index d2aed3488c24..000000000000
--- a/audio/py-musicbrainz2/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-bin/mb-submit-disc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/__init__.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/__init__.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/__init__.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/__init__.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/__init__.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/countrynames.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/countrynames.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/countrynames.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/languagenames.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/languagenames.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/languagenames.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/releasetypenames.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/releasetypenames.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/releasetypenames.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/scriptnames.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/scriptnames.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/data/scriptnames.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/disc.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/model.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/model.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/model.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/utils.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/webservice.pyo
-%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.py
-%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.pyc
-%%PYTHON_SITELIBDIR%%/musicbrainz2/wsxml.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/musicbrainz2/data
-@dirrm %%PYTHON_SITELIBDIR%%/musicbrainz2