diff --git a/devel/cvsbook/Makefile b/devel/cvsbook/Makefile
index c7671466bc8a..b75e0ce1c9f7 100644
--- a/devel/cvsbook/Makefile
+++ b/devel/cvsbook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cvsbook
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://cvsbook.red-bean.com/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
@@ -14,16 +15,37 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tutorial and reference for CVS
 
-NO_BUILD=	yes
+ALL_TARGET=	version
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
+INFO=		cvsbook
+PLIST_FILES+=	%%DOCSDIR%%/cvsbook.html \
+		%%DOCSDIR%%/cvsbook.pdf \
+		%%DOCSDIR%%/cvsbook.ps
+
+.if defined(WITH_SPLIT_HTML)
+ALL_TARGET+=	html-monolithic
+.endif
+
+.if !defined(WITH_SPLIT_HTML)
+pre-everything::
+	@${ECHO_MSG} "You can install SPLIT-HTML format of cvsbook"
+	@${ECHO_MSG} "by defining WITH_SPLIT_HTML"
+.endif
 
 do-install:
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/cvsbook-shtml
+.if defined(WITH_SPLIT_HTML)
+	@cd ${WRKSRC}/cvsbook && ${FIND} . -type f| ${CUT} -c2- \
+	| ${SED} 's|^|${DOCSDIR:S,${PREFIX}/,,}/cvsbook-shtml/|' \
+	| ${SORT} >> ${TMPPLIST}
+	@${INSTALL_DATA} ${WRKSRC}/cvsbook/* ${DOCSDIR}/cvsbook-shtml/
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.html ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.pdf ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.ps ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/cvsbook.info* ${PREFIX}/info
 	@install-info ${PREFIX}/info/cvsbook.info ${PREFIX}/info/dir
+	@${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}/cvsbook-shtml" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/cvsbook/distinfo b/devel/cvsbook/distinfo
index be244f6df150..15c624850826 100644
--- a/devel/cvsbook/distinfo
+++ b/devel/cvsbook/distinfo
@@ -1,2 +1,2 @@
-MD5 (cvsbook-1.21-all.tar.gz) = 409b1ce76dbd152e766e1dfdcb121cdc
-SIZE (cvsbook-1.21-all.tar.gz) = 1735577
+MD5 (cvsbook-1.21-all.tar.gz) = 8ee9176be735189cd0f88919e482fffb
+SIZE (cvsbook-1.21-all.tar.gz) = 2026612
diff --git a/devel/cvsbook/pkg-plist b/devel/cvsbook/pkg-plist
deleted file mode 100644
index 9926e1abf63f..000000000000
--- a/devel/cvsbook/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-%%DOCSDIR%%/cvsbook.html
-%%DOCSDIR%%/cvsbook.pdf
-%%DOCSDIR%%/cvsbook.ps
-@unexec install-info --delete %D/info/cvsbook.info %D/info/dir
-info/cvsbook.info
-info/cvsbook.info-1
-info/cvsbook.info-10
-info/cvsbook.info-11
-info/cvsbook.info-12
-info/cvsbook.info-13
-info/cvsbook.info-2
-info/cvsbook.info-3
-info/cvsbook.info-4
-info/cvsbook.info-5
-info/cvsbook.info-6
-info/cvsbook.info-7
-info/cvsbook.info-8
-info/cvsbook.info-9
-@exec install-info %D/info/cvsbook.info %D/info/dir
-@dirrm %%DOCSDIR%%