diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile
index 8ad1eb29644f..97decc3b9f8b 100644
--- a/www/trac-wikitopdf/Makefile
+++ b/www/trac-wikitopdf/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
+PORTNAME=	wikitopdf
 PORTVERSION=	2.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -15,10 +15,10 @@ COMMENT=	Plugin to generate PDF documents from the Wiki
 RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc \
 		tracd:${PORTSDIR}/www/trac
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracWikiToPdfPlugin
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 WRKSRC=			${WRKDIR}/${PORTNAME}plugin
 
+.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>
diff --git a/www/trac/plugin.mk b/www/trac/plugin.mk
new file mode 100644
index 000000000000..c60c45462562
--- /dev/null
+++ b/www/trac/plugin.mk
@@ -0,0 +1,6 @@
+# needed to avoid polluting /root with .subversion/ leftovers,
+# which will cause package builders to complain on staging.
+#
+# www/trac issues some svn command on installing certain plugins,
+# if it was built with the SVN option enabled
+MAKE_ENV+=	HOME=/dev/null