diff --git a/www/mod_tsunami/Makefile b/www/mod_tsunami/Makefile
index 493f98fc092e..8c8312f25692 100644
--- a/www/mod_tsunami/Makefile
+++ b/www/mod_tsunami/Makefile
@@ -13,23 +13,20 @@ MASTER_SITES=	http://bertrand.demiddelaer.org/mod_tsunami/
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Apache module which dynamically limits a site's slot usage
 
-USE_APACHE=	yes
-DOCS=		AUTHORS Changelog
+USE_APACHE=	1.3
+AP_FAST_BUILD=	yes
+AP_GENPLIST=	yes
 
-do-build:
-	@cd ${WRKSRC} && ${APXS} -c mod_tsunami.c
-
-do-install:
-	${APXS} -i -A -n tsunami ${WRKSRC}/mod_tsunami.so
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-	@${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
+PORTDOCS=		AUTHORS Changelog docs
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/
+.for f in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+.endfor
+	@${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}/
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/mod_tsunami/pkg-plist b/www/mod_tsunami/pkg-plist
deleted file mode 100644
index 427505e618ce..000000000000
--- a/www/mod_tsunami/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-libexec/apache/mod_tsunami.so
-@exec %D/sbin/apxs -e -A -n tsunami %D/%F
-@unexec %D/sbin/apxs -e -A -n tsunami %D/%F
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/mod_tsunami_files/index.gif
-%%PORTDOCS%%%%DOCSDIR%%/mod_tsunami_files/home.gif
-%%PORTDOCS%%%%DOCSDIR%%/mod_tsunami_files/sub.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/mod_tsunami_files
-%%PORTDOCS%%@dirrm %%DOCSDIR%%