diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index dbd5f6fa7ebd..50aa676e533d 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xml2rfc
 PORTVERSION=	2.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://tools.ietf.org/tools/xml2rfc2/cli/
 
@@ -14,8 +14,9 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:${PORTSDIR}/devel/py-lxml
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/textproc/xml2rfc/pkg-plist b/textproc/xml2rfc/pkg-plist
deleted file mode 100644
index 8963bbf706fe..000000000000
--- a/textproc/xml2rfc/pkg-plist
+++ /dev/null
@@ -1,52 +0,0 @@
-bin/xml2rfc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/xml2rfc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/log.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/log.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/log.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/parser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/parser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/parser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/templates/address_card.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/templates/base.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/templates/rfc2629-other.ent
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/templates/rfc2629-xhtml.ent
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/templates/rfc2629.dtd
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/expanded_xml.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/expanded_xml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/expanded_xml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/html.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/html.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/nroff.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/nroff.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/nroff.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/paginated_txt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/paginated_txt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/paginated_txt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/raw_txt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/raw_txt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers/raw_txt.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/writers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/xml2rfc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%