diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index d078d9be75b..0ff72dc52b8 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -3,9 +3,10 @@ pkgname=cvs
 version=1.12.13
 revision=1
 build_style=gnu-configure
-configure_args="--with-editor=/usr/bin/vi --with-external-zlib"
-hostmakedepends="nvi"
-makedepends="mit-krb5-devel openssh>=6.1p1"
+configure_args="--with-editor=/usr/bin/vi --with-external-zlib
+ cvs_cv_func_printf_ptr=yes ac_cv_func_malloc_0_nonnull=yes"
+hostmakedepends="nvi openssh"
+makedepends="mit-krb5-devel openssh"
 short_desc="Concurrent Versions System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.nongnu.org/cvs/"