diff --git a/www/boa/Makefile b/www/boa/Makefile
index 6a0faf2926d1..50e7013ede86 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -11,42 +11,48 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance single-tasking web server
 
+LICENSE=	GPLv2 # or later
+
 USES=		gmake makeinfo tar:bzip2
 GNU_CONFIGURE=	yes
 
 INFO=		boa
-MAN8=		boa.8
 
 PORTDOCS=	boa.texi boa.html boa.txt boa_banner.png
+PORTEXAMPLES=	boa.conf cgi-test.cgi nph-test.cgi resolver.pl
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	etc/rc.d/boa.sh.sample \
+		man/man8/boa.8.gz \
+		sbin/boa \
+		sbin/boa_indexer \
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/examples/boa.conf ${WRKSRC}/src/defines.h
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${PREFIX}/sbin
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${PREFIX}/man/man8
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/boa.conf ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/cgi-test.cgi ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/nph-test.cgi ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/resolver.pl ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${STAGEDIR}${PREFIX}/sbin
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${STAGEDIR}${PREFIX}/sbin
+	@${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${STAGEDIR}${PREFIX}/man/man8
+	@${INSTALL_DATA} ${WRKSRC}/docs/boa.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	@${INSTALL_SCRIPT} ${FILESDIR}/boa.sh.sample ${STAGEDIR}${PREFIX}/etc/rc.d
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for f in ${PORTEXAMPLES}
+	@${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/docs/boa.info ${PREFIX}/info
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/boa.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/boa.sh.sample \
-			startup file."; \
-		${INSTALL_SCRIPT} ${FILESDIR}/boa.sh.sample \
-			${PREFIX}/etc/rc.d; \
-	fi
 
 .include <bsd.port.mk>
diff --git a/www/boa/files/pkg-message.in b/www/boa/files/pkg-message.in
new file mode 100644
index 000000000000..dd96628826ce
--- /dev/null
+++ b/www/boa/files/pkg-message.in
@@ -0,0 +1,7 @@
+
+You may wish to copy and edit the sample startup script
+
+%%PREFIX%%/etc/rc.d/boa.sh.sample
+
+according to your requirements.
+
diff --git a/www/boa/pkg-plist b/www/boa/pkg-plist
deleted file mode 100644
index 9a1f0eea135c..000000000000
--- a/www/boa/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-etc/rc.d/boa.sh.sample
-sbin/boa
-sbin/boa_indexer
-%%EXAMPLESDIR%%/boa.conf
-%%EXAMPLESDIR%%/cgi-test.cgi
-%%EXAMPLESDIR%%/nph-test.cgi
-%%EXAMPLESDIR%%/resolver.pl
-@dirrm %%EXAMPLESDIR%%