diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index 39eb62e339da..527ab28496e5 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	autocomplete
 PORTVERSION=	0.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
@@ -14,18 +14,12 @@ COMMENT=	Plugin for autocompletion of user names in ticket fields
 
 RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
 
-USE_PYTHON=	2
 USES=		zip
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	AutocompleteUsers
-PYDISTUTILS_NOEGGINFO=	yes
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 WRKSRC=		${WRKDIR}/autocompleteusersplugin/0.11
 REL=		8451
 
-# Target to generate packaging list
-plist:
-	@${FIND} ${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}.egg -type f | ${SED} -e's|^${PYTHON_SITELIBDIR}/|%%PYTHON_SITELIBDIR%%/|;s|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py[[:digit:]\.]*.egg/|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py%%PYTHON_VER%%.egg/|'
-	@${FIND} ${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}.egg -type d -mindepth 1 | ${SORT} -r | ${SED} -e's|^${PYTHON_SITELIBDIR}/|@dirrm %%PYTHON_SITELIBDIR%%/|;s|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py[[:digit:]\.]*.egg/|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py%%PYTHON_VER%%.egg/|'
-	@${ECHO} '@dirrm %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py%%PYTHON_VER%%.egg'
-
+.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>
diff --git a/www/trac-autocomplete/pkg-plist b/www/trac-autocomplete/pkg-plist
deleted file mode 100644
index ff81e6e7a3fc..000000000000
--- a/www/trac-autocomplete/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/autocompleteusers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/autocompleteusers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/autocompleteusers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/css/indicator.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/css/autocomplete.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_ticket.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/format_item.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_ticket_cc.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_newticket.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_newticket_cc.js
-%%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/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/css
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%