diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile
index 1a44d7fc4c1c..898c3109751f 100644
--- a/www/feedjack/Makefile
+++ b/www/feedjack/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	feedjack
 PORTVERSION=	0.9.16
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.feedjack.org/download/
 DISTNAME=	Feedjack-${PORTVERSION}
@@ -13,12 +14,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedpars
 		django-admin.py:${PORTSDIR}/www/py-django
 
 DIST_SUBDIR=	python
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	Feedjack
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-PLIST_SUB=	FEEDJACKVER=${PORTVERSION}	\
-		PYTHONVER=${PYTHON_VER}
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/www/feedjack/pkg-plist b/www/feedjack/pkg-plist
deleted file mode 100644
index 18aee2b58e44..000000000000
--- a/www/feedjack/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/feedjack_update.py
-%%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/scripts/feedjack_update.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/admin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/admin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/admin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjcache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjcache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjcache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjcloud.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjcloud.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjcloud.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjlib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjlib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/fjlib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/en/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/en/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/es/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/es/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/sr/LC_MESSAGES/django.mo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/sr/LC_MESSAGES/django.po
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/models.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/models.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/models.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-atom.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-css.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-django.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-foaf.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-hacker.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-opml.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-rss.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/button-xhtml.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/faces/nobody.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/feed.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/style.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/default.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/dot.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/fade.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/h2_bg.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/css.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/django_80x15.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/faces/nobody.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/hacker.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/rss20.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/xhtml.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/posts.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/smiley.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/theme.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack/default/post_list.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack/foaf.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack/opml.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack/sinx/post_list.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feeds/rss_description.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feeds/rss_title.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/urls.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/urls.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/urls.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/views.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/views.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/views.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feeds
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack/sinx
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates/feedjack
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img/faces
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx/img
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/sinx
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img/faces
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default/img
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack/default
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static/feedjack
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/sr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/sr
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/es/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/es
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/en/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale/en
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack/locale
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/feedjack
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%