diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile
index 4f05b1382acc..08f8ef02ed80 100644
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@@ -10,8 +10,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CVS repository activity report generator
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
@@ -20,22 +18,22 @@ USE_JAVA=	yes
 USE_ANT=	yes
 JAVA_VERSION=	1.6+
 
-.if !defined(NOPORTDOCS)
-ALL_TARGET=	jar javadoc
-.else
 ALL_TARGET=	jar
-.endif
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
-do-install:
-	@cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+ALL_TARGET+=	javadoc
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	(cd ${WRKSRC}/dist && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+.if ${PORT_OPTIONS:MDOCS}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/statcvs/pkg-descr b/devel/statcvs/pkg-descr
index 0e8bcdf3eb3a..40658f4d8208 100644
--- a/devel/statcvs/pkg-descr
+++ b/devel/statcvs/pkg-descr
@@ -4,4 +4,4 @@ timeline for the lines of code, contribution of each developer etc.
 The current version of StatCVS generates a static suite of HTML or
 XDOC documents containing tables and chart images.
 
-WWW:    http://statcvs.sourceforge.net/
+WWW: http://statcvs.sourceforge.net/