diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile
index 99062f0d3ada..f68c825a4f2d 100644
--- a/www/py-jonpy/Makefile
+++ b/www/py-jonpy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jonpy
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,20 +11,21 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Python FastCGI interface library
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-NO_BUILD=		yes
+LICENSE=	MIT
+
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
-	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/example && ${FIND} . | \
-		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR})
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/py-jonpy/pkg-plist b/www/py-jonpy/pkg-plist
deleted file mode 100644
index 238883d92ca7..000000000000
--- a/www/py-jonpy/pkg-plist
+++ /dev/null
@@ -1,49 +0,0 @@
-%%PYTHON_SITELIBDIR%%/jon/__init__.py
-%%PYTHON_SITELIBDIR%%/jon/cgi.py
-%%PYTHON_SITELIBDIR%%/jon/dbpool.py
-%%PYTHON_SITELIBDIR%%/jon/fakefile.py
-%%PYTHON_SITELIBDIR%%/jon/fcgi.py
-%%PYTHON_SITELIBDIR%%/jon/mime.py
-%%PYTHON_SITELIBDIR%%/jon/modpy.py
-%%PYTHON_SITELIBDIR%%/jon/session.py
-%%PYTHON_SITELIBDIR%%/jon/wt/__init__.py
-%%PYTHON_SITELIBDIR%%/jon/wt/multiform.py
-%%PYTHON_SITELIBDIR%%/jon/wt/rowaccess.py
-%%PYTHON_SITELIBDIR%%/jon/wt/textblock.py
-%%PYTHON_SITELIBDIR%%/jon/wt/__init__.pyc
-%%PYTHON_SITELIBDIR%%/jon/wt/multiform.pyc
-%%PYTHON_SITELIBDIR%%/jon/wt/rowaccess.pyc
-%%PYTHON_SITELIBDIR%%/jon/wt/textblock.pyc
-%%PYTHON_SITELIBDIR%%/jon/wt/__init__.pyo
-%%PYTHON_SITELIBDIR%%/jon/wt/multiform.pyo
-%%PYTHON_SITELIBDIR%%/jon/wt/rowaccess.pyo
-%%PYTHON_SITELIBDIR%%/jon/wt/textblock.pyo
-%%PYTHON_SITELIBDIR%%/jon/__init__.pyc
-%%PYTHON_SITELIBDIR%%/jon/cgi.pyc
-%%PYTHON_SITELIBDIR%%/jon/dbpool.pyc
-%%PYTHON_SITELIBDIR%%/jon/fakefile.pyc
-%%PYTHON_SITELIBDIR%%/jon/fcgi.pyc
-%%PYTHON_SITELIBDIR%%/jon/mime.pyc
-%%PYTHON_SITELIBDIR%%/jon/modpy.pyc
-%%PYTHON_SITELIBDIR%%/jon/session.pyc
-%%PYTHON_SITELIBDIR%%/jon/__init__.pyo
-%%PYTHON_SITELIBDIR%%/jon/cgi.pyo
-%%PYTHON_SITELIBDIR%%/jon/dbpool.pyo
-%%PYTHON_SITELIBDIR%%/jon/fakefile.pyo
-%%PYTHON_SITELIBDIR%%/jon/fcgi.pyo
-%%PYTHON_SITELIBDIR%%/jon/mime.pyo
-%%PYTHON_SITELIBDIR%%/jon/modpy.pyo
-%%PYTHON_SITELIBDIR%%/jon/session.pyo
-%%PYTHON_SITELIBDIR%%/jon/wsgi.py
-%%PYTHON_SITELIBDIR%%/jon/wsgi.pyc
-%%PYTHON_SITELIBDIR%%/jon/wsgi.pyo
-%%EXAMPLESDIR%%/wt/.htaccess
-%%EXAMPLESDIR%%/wt/printenv.html.py
-%%EXAMPLESDIR%%/cgi-bin/wt.py
-%%EXAMPLESDIR%%/printenv.html
-%%EXAMPLESDIR%%/.htaccess
-@dirrm %%PYTHON_SITELIBDIR%%/jon/wt
-@dirrm %%PYTHON_SITELIBDIR%%/jon
-@dirrm %%EXAMPLESDIR%%/cgi-bin
-@dirrm %%EXAMPLESDIR%%/wt
-@dirrm %%EXAMPLESDIR%%