diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index 720ccaf08e..9caa9dc1aa 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -1,14 +1,17 @@
 # Template file for 'cvs'
 pkgname=cvs
 version=1.11.23
+revision=2
 patch_args="-Np1"
-distfiles="http://ftp.gnu.org/non-gnu/cvs/source/stable/$version/cvs-$version.tar.bz2"
 build_style=gnu-configure
-revision=1
-makedepends="mit-krb5-devel"
+configure_args="--with-editor=/usr/bin/vi"
+makedepends="mit-krb5-devel nvi"
 fulldepends="openssh-client"
 short_desc="Concurrent Versions System"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.nongnu.org/cvs/"
+license="GPL-1, LGPL-2"
+distfiles="http://ftp.gnu.org/non-gnu/cvs/source/stable/$version/cvs-$version.tar.bz2"
 checksum=400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9
 long_desc="
  CVS is a version control system, an important component of Source
@@ -18,4 +21,3 @@ long_desc="
 
  CVS is a production quality system in wide use around the world, including
  many free software projects."
-