diff --git a/dev-vcs/cvs/cvs-1.12.13.1.bep b/dev-vcs/cvs/cvs-1.12.13.1.bep
index 0f664f9e6..94cf44780 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.bep
+++ b/dev-vcs/cvs/cvs-1.12.13.1.bep
@@ -1,21 +1,34 @@
-DESCRIPTION="CVS is a version control system" 
+SUMMARY="Concurrent Versions System"
+DESCRIPTION="CVS is a version control system." 
 HOMEPAGE="http://www.nongnu.org/cvs/" 
-SRC_URI="http://ftp.nctu.edu.tw/GNU/non-gnu/cvs/source/nightly-snapshots/feature/cvs-1.12.13.1.tar.bz2"
+SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2"
 CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
-REVISION="1"
+REVISION="2"
 STATUS_HAIKU="stable"
-DEPEND=""
+
+PROVIDES="cvs = $portVersion compat >= 1.12
+	cmd:cvs = $portVersion compat >= 1.12"
+REQUIRES="haiku-devel >= $haikuVersion
+	zlib >= 1.1.4"
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES="haiku-devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD {
-	cd cvs-1.12.13.1
 	libtoolize --force --copy --install
-	./configure --prefix=/boot/common --enable-rootcommit
+	./configure $configureDirArgs --enable-rootcommit
 	make
 }
 
 INSTALL {
-	cd cvs-1.12.13.1
 	make install
 }
+
 LICENSE="GNU GPL v1
 	GNU LGPL v2"
 COPYRIGHT="1986-2005 Free Software Foundation, Inc."