diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 75cc1fd1dcc7..2619ff4a47ae 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -2,40 +2,29 @@
 
 PORTNAME=	cvs
 PORTVERSION=	1.20120905
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/eadler
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Version control system
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or any later version
 
 OPTIONS_DEFINE=	KERBEROS EXAMPLES
 OPTIONS_DEFAULT=KERBEROS
 
-USES=		tar:xz uidfix
+KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
+
+USES=		makeinfo tar:xz uidfix
 WRKSRC=		${WRKDIR}/call/cvs-build
+INFO=		cvs cvsclient
 
 # bsd.stage.makes sets the wrong value for DESTDIR
 DESTDIRNAME=	NADA
 MAKE_ARGS=	DESTDIR=${STAGEDIR}${PREFIX}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKERBEROS}
-MAKE_ARGS+=	KERBEROS_SUPPORT=yes
-.else
-MAKE_ARGS+=	KERBEROS_SUPPORT=no
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000
-BROKEN=	does not link
-.endif
-
 pre-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/cvs/files/patch-Makefile b/devel/cvs/files/patch-Makefile
deleted file mode 100644
index 1f6c1dcbad4c..000000000000
--- a/devel/cvs/files/patch-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig	2012-01-21 05:30:07 UTC
-+++ Makefile
-@@ -1,5 +1,5 @@
- # $FreeBSD: head/gnu/usr.bin/cvs/Makefile 175384 2008-01-16 17:16:36Z obrien $
- 
--SUBDIR = lib libdiff cvs contrib cvsbug doc
-+SUBDIR = lib libdiff cvs contrib cvsbug
- 
- .include <bsd.subdir.mk>
diff --git a/devel/cvs/files/patch-cvs.info.texinfo-5.x b/devel/cvs/files/patch-cvs.info.texinfo-5.x
new file mode 100644
index 000000000000..5ce5044b92c6
--- /dev/null
+++ b/devel/cvs/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
+--- ../cvs/doc/cvs.texinfo
++++ ../cvs/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}
diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
index 3f0b82e696dd..490b16745d09 100644
--- a/devel/cvs/files/patch-cvs__Makefile
+++ b/devel/cvs/files/patch-cvs__Makefile
@@ -5,7 +5,7 @@
  LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
  
 -.if ${MK_KERBEROS_SUPPORT} != "no"
-+.if ${KERBEROS_SUPPORT} != "no"
++.if defined(KERBEROS_SUPPORT)
  CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
  LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
  DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}