diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile
index 14169072aba7..a28290b1c67a 100644
--- a/www/trac-fullblognotification/Makefile
+++ b/www/trac-fullblognotification/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
+PORTNAME=	fullblognotification
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -15,9 +15,9 @@ COMMENT=	Plugin that provides a project Blog
 
 RUN_DEPENDS+=	trac-fullblog>=0.1.1:${PORTSDIR}/www/trac-fullblog
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	TracFullBlogNotificationPlugin
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 .if defined(BOOTSTRAP)
 do-fetch:
@@ -29,13 +29,5 @@ do-fetch:
 	    tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-build-plist:
-	@${CAT} /dev/null > ${PLIST}
-	${FIND} ${EGG_PATH} -type f | \
-	    ${SED} -e 's|${EGG_PATH}|%%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-%%PORTVERSION%%-py%%PYTHON_VER%%.egg|' | \
-	    ${SORT} >> ${PLIST}
-	${FIND} ${EGG_PATH} -type d | \
-	    ${SED} -e 's|${EGG_PATH}|@dirrm %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-%%PORTVERSION%%-py%%PYTHON_VER%%.egg|' | \
-	    ${SORT} -r >> ${PLIST}
-
+.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>
diff --git a/www/trac-fullblognotification/pkg-plist b/www/trac-fullblognotification/pkg-plist
deleted file mode 100644
index f4df850a2802..000000000000
--- a/www/trac-fullblognotification/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-%%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/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/fullblognotification.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/fullblognotification.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/fullblognotification.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/notification.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/notification.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/notification.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/templates/fullblognotification_email_template.txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/fullblognotification
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%