diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index a65d1edcd779..39bc8610aa86 100644
--- a/devel/py-repoze.who/Makefile
+++ b/devel/py-repoze.who/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	repoze.who
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,8 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=easy_install
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-repoze.who/pkg-plist b/devel/py-repoze.who/pkg-plist
deleted file mode 100644
index 0364b5a36816..000000000000
--- a/devel/py-repoze.who/pkg-plist
+++ /dev/null
@@ -1,116 +0,0 @@
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/namespace_packages.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/_auth_tkt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/_auth_tkt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/_auth_tkt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/_compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/_compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/_compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/api.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/api.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/api.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/classifiers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/classifiers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/classifiers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/interfaces.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/middleware.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/middleware.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/middleware.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/auth_tkt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/auth_tkt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/auth_tkt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/basicauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/basicauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/basicauth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/htpasswd.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/htpasswd.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/htpasswd.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/redirector.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/redirector.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/redirector.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/sql.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/sql.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/sql.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/test.htpasswd
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/testapp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/testapp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures/testapp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_authtkt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_authtkt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_authtkt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_basicauth.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_basicauth.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_basicauth.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_htpasswd.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_htpasswd.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_htpasswd.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_redirector.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_redirector.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_redirector.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_sql.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_sql.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/test_sql.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/restrict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/restrict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/restrict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test__auth_tkt.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test__auth_tkt.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test__auth_tkt.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test__compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test__compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test__compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_api.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_api.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_api.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_classifiers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_classifiers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_classifiers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_middleware.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_middleware.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_middleware.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_restrict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_restrict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests/test_restrict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests/fixtures
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%