diff --git a/net/pyrad/Makefile b/net/pyrad/Makefile
index 3a7d7ead81d7..2be78c529b69 100644
--- a/net/pyrad/Makefile
+++ b/net/pyrad/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyrad
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,15 +11,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	steve@energistic.com
 COMMENT=	Python implementation of RADIUS client
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	pyrad
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -27,8 +27,8 @@ post-patch:
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/pyrad/pkg-plist b/net/pyrad/pkg-plist
deleted file mode 100644
index c81f00060c60..000000000000
--- a/net/pyrad/pkg-plist
+++ /dev/null
@@ -1,77 +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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/bidict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/bidict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/bidict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/client.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/client.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/client.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/curved.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/curved.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/curved.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictfile.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictfile.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictfile.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictionary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictionary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/dictionary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/host.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/host.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/host.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/packet.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/packet.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/packet.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/proxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/proxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/proxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data/dictfiletest
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data/full
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data/simple
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/mock.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/mock.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/mock.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testBidict.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testBidict.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testBidict.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testClient.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testClient.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testClient.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testDictionary.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testDictionary.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testDictionary.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testHost.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testHost.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testHost.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testPacket.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testPacket.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testPacket.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testProxy.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testProxy.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testProxy.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testServer.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testServer.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testServer.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testTools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testTools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/testTools.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tools.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests/data
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pyrad
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%