diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index 0e4e00babcad..c7b9f3dd63e1 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cvs
 PORTVERSION=	1.12.13
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	non-gnu/${PORTNAME}/source/feature/${PORTVERSION}
@@ -14,8 +14,8 @@ COMMENT=	IPv6 enabled cvs.  You can use IPv6 connection when using pserver
 
 CONFLICTS=	cvsnt-[12]* cvs+ipv6-[12]*
 
+USES=		makeinfo tar:bzip2
 GNU_CONFIGURE=	yes
-USES=	tar:bzip2
 CONFIGURE_ARGS=	--enable-ipv6 --without-gssapi \
 		--with-editor="vi" \
 		--with-tmpdir="/tmp"
diff --git a/devel/cvs-devel/files/patch-cvs.info.texinfo-5.x b/devel/cvs-devel/files/patch-cvs.info.texinfo-5.x
new file mode 100644
index 000000000000..ad920c450275
--- /dev/null
+++ b/devel/cvs-devel/files/patch-cvs.info.texinfo-5.x
@@ -0,0 +1,22 @@
+From 6733b1455f97531bace80bf7118dc644fe73fd3d Mon Sep 17 00:00:00 2001
+From: tg <tg@mirbsd.org>
+Date: Wed, 26 Jun 2013 18:15:51 +0000
+Subject: Make cvs.texinfo compatible with newer makeinfo (Closes: #711298)
+
+
+diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo
+index a0136a5..d11a5e1 100644
+--- doc/cvs.texinfo
++++ doc/cvs.texinfo
+@@ -113,9 +113,9 @@ approved by the Free Software Foundation.
+ @sp 4
+ @comment The title is printed in a large font.
+ @center @titlefont{Version Management}
+-@sp
++@sp 1
+ @center @titlefont{with}
+-@sp
++@sp 1
+ @center @titlefont{CVS}
+ @sp 2
+ @center for @sc{cvs} @value{VERSION}