diff --git a/devel/cvs+ipv6/Makefile b/devel/cvs+ipv6/Makefile
index 186018f7db38..457b93628719 100644
--- a/devel/cvs+ipv6/Makefile
+++ b/devel/cvs+ipv6/Makefile
@@ -1,14 +1,14 @@
-PORTREVISION=	3
+PORTREVISION=	4
 PKGNAMESUFFIX=	+ipv6
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IPv6 enabled cvs.  You can use IPv6 connection when using pserver
 
 CONFLICTS_INSTALL=	cvs cvs-devel
 
 OPTIONS_SLAVE=		IPV6
 OPTIONS_EXCLUDE=	# empty
 
 MASTERDIR=	${.CURDIR}/../cvs
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index fac27528a6b9..30c4715616e0 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	cvs
 PORTVERSION=	1.20120905
-PORTREVISION?=	7
+PORTREVISION?=	8
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/eadler
 
 MAINTAINER?=	schaiba@gmail.com
 COMMENT?=	Version control system
 
 LICENSE=	GPLv2+
 
 USES=		cpe shebangfix tar:xz uidfix
 
 CONFLICTS_INSTALL?=	cvs-devel cvs+ipv6
 
 OPTIONS_DEFINE=	INFO IPV6 KERBEROS EXAMPLES
 OPTIONS_DEFAULT=INFO KERBEROS
 .if !make(makesum)
 OPTIONS_EXCLUDE?=IPV6
 .endif
 
 INFO_INFO=		cvs cvsclient
 INFO_USES=		makeinfo
 IPV6_PATCH_SITES=	LOCAL/ume
 IPV6_PATCHFILES=	${DISTNAME}-v6-20140105.diff.gz:-p1
 KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
 
 CPE_VENDOR=	gnu
 SHEBANG_FILES=	contrib/clmerge contrib/cln_hist \
 		contrib/commit_prep contrib/cvs_acls \
 		contrib/easy-import contrib/log \
 		contrib/log_accum contrib/mfpipe \
 		contrib/rcslock
 PATCH_WRKSRC=	${WRKDIR}/call/cvs
 WRKSRC=		${WRKDIR}/call/cvs-build
 
 # bsd.stage.makes sets the wrong value for DESTDIR
 DESTDIRNAME=	NADA
 MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
 # XXX static PIE libraries not yet supported by the base system
 MAKE_ARGS+=	WITHOUT_PIE=true
+MAKE_ARGS+=	MANDIR=/share/man/man
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/info/,/${INFO_PATH}/,g" ${WRKSRC}/Makefile.inc
 .if !${PORT_OPTIONS:MINFO}
 	@${REINPLACE_CMD} -e "s,doc,,g" ${WRKSRC}/Makefile
 .endif
 pre-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
 .include <bsd.port.mk>
diff --git a/devel/cvs/pkg-plist b/devel/cvs/pkg-plist
index 588ea6c156f2..042f0fa5d543 100644
--- a/devel/cvs/pkg-plist
+++ b/devel/cvs/pkg-plist
@@ -1,23 +1,23 @@
 bin/cvs
 bin/cvsbug
-man/man1/cvs.1.gz
-man/man8/cvsbug.8.gz
+share/man/man1/cvs.1.gz
+share/man/man8/cvsbug.8.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/clmerge
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cln_hist
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/commit_prep
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvs2vendor
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvs_acls
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvscheck
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/intro.doc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/log
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/log_accum
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/mfpipe
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcs-to-cvs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcslock
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/sccs2rcs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcs2log
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/easy-import
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvscheck.man
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvshelp.man
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/descend.man