diff --git a/www/trac-keywords/Makefile b/www/trac-keywords/Makefile
index 8c785e6611d3..c266888dc0a0 100644
--- a/www/trac-keywords/Makefile
+++ b/www/trac-keywords/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	keywords
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
@@ -14,13 +14,12 @@ COMMENT=	Plugin for using pre-configured keywords
 
 RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
 
-USE_PYTHON=	2
 USES=		zip
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracKeywordsPlugin
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 WRKSRC=			${WRKDIR}/trackeywordsplugin/0.11
 REL=			7273
-PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 post-extract:
 # Fix misplaced Genshi template: https://trac-hacks.org/ticket/6104
@@ -28,4 +27,5 @@ post-extract:
 # Seems like web_ui.py was misplaced too.
 	@${MV} ${WRKDIR}/trackeywordsplugin/0.10/trackeywords/web_ui.py ${WRKSRC}/trackeywords/
 
+.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>