diff --git a/devel/py-repoze.who-friendlyform/Makefile b/devel/py-repoze.who-friendlyform/Makefile
index 312631eab56b..ae265154eb5a 100644
--- a/devel/py-repoze.who-friendlyform/Makefile
+++ b/devel/py-repoze.who-friendlyform/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ychsiao@ychsiao.org
-COMMENT=	A collection of developer-friendly for repoze.who-powered
+COMMENT=	Collection of developer-friendly for repoze.who-powered
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
 		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
@@ -18,8 +18,8 @@ RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
 		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	repoze.who-friendlyform
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-repoze.who-friendlyform/pkg-descr b/devel/py-repoze.who-friendlyform/pkg-descr
index ebae37c3a02d..77f91e974147 100644
--- a/devel/py-repoze.who-friendlyform/pkg-descr
+++ b/devel/py-repoze.who-friendlyform/pkg-descr
@@ -6,4 +6,4 @@ although for the time being such a collection has only
 one item.
 
 
-WWW:	http://code.gustavonarea.net/repoze.who-friendlyform/
+WWW: http://code.gustavonarea.net/repoze.who-friendlyform/
diff --git a/devel/py-repoze.who-friendlyform/pkg-plist b/devel/py-repoze.who-friendlyform/pkg-plist
deleted file mode 100644
index 54c1394f2ffc..000000000000
--- a/devel/py-repoze.who-friendlyform/pkg-plist
+++ /dev/null
@@ -1,25 +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/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/friendlyform.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/friendlyform.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/repoze/who/plugins/friendlyform.pyo
-@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%%/