diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index 36a04fc72eb6..cc5ca5f4c81b 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -1,28 +1,32 @@
 PORTNAME=	cvs
-PORTVERSION=	1.12.13
-PORTREVISION=	14
+DISTVERSION=	1.12.13
+PORTREVISION=	15
 CATEGORIES=	devel
-MASTER_SITES=	GNU/non-gnu/${PORTNAME}/source/feature/${PORTVERSION}
+MASTER_SITES=	GNU/non-gnu/${PORTNAME}/source/feature/${DISTVERSION}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bdheeman@gmail.com
-COMMENT=	IPv6 enabled cvs.  You can use IPv6 connection when using pserver
-WWW=		https://www.cvshome.org/
+COMMENT=	IPv6 enabled cvs. You can use IPv6 connection when using pserver
+WWW=		https://www.nongnu.org/cvs/
 
-CONFLICTS=	cvs cvs+ipv6
+LICENSE=	GPLv1
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe makeinfo perl5 tar:bzip2
+USES=		cpe gettext-runtime makeinfo perl5 tar:bzip2
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS=	--enable-ipv6 --without-gssapi \
+CONFIGURE_ARGS=	--enable-ipv6 \
 		--with-editor="vi" \
-		--with-tmpdir="/tmp"
+		--with-external-zlib \
+		--with-tmpdir="/tmp" \
+		--without-gssapi
+
+CONFLICTS=	cvs cvs+ipv6
 
 INFO=		cvs cvsclient
 
 CVS_SITE?=	:pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs
-CVS_VER?=	v${PORTVERSION:S//_/g}
+CVS_VER?=	v${DISTVERSION:S//_/g}
 
 OPTIONS_DEFINE=	PAM
 PAM_DESC=	PAM support
@@ -30,11 +34,11 @@ PAM_DESC=	PAM support
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=--enable-pam
+CONFIGURE_ARGS+=	--enable-pam
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's/${PORTVERSION:S/./\./g}/&-devel/g' \
+	@${REINPLACE_CMD} 's/${DISTVERSION:S/./\./g}/&-devel/g' \
 		${WRKSRC}/configure
 	@${CP} ${FILESDIR}/missing ${WRKSRC}