diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile
index c62db0483f3e..740984dfd846 100644
--- a/www/trac-fivestarvote/Makefile
+++ b/www/trac-fivestarvote/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
+PORTNAME=	fivestarvote
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -13,10 +13,9 @@ COMMENT=	Five star plugin for voting on Trac resources
 
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	FiveStarVote
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 # Maintainter targets below this point
 
@@ -31,15 +30,5 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-# Create a pkg-plist after the package is installed.
-EGGDIR=		${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
-PLIST_EGGDIR=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-build-plist:
-	${FIND} ${EGGDIR} -type f | \
-	    ${SED} -e 's|${EGGDIR}|${PLIST_EGGDIR}|' | \
-	    ${SORT} > pkg-plist
-	${FIND} ${EGGDIR} -type d | \
-	    ${SED} -e 's|${EGGDIR}|@dirrm ${PLIST_EGGDIR}|' | \
-	    ${SORT} -r >> pkg-plist
-
+.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>