diff --git a/cvs/build.sh b/cvs/build.sh
index 3f024a0..e5a15c9 100755
--- a/cvs/build.sh
+++ b/cvs/build.sh
@@ -9,8 +9,8 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=cvs
-version=1.11.20
-pkgver=2
+version=1.11.22
+pkgver=1
 source[0]=$topdir-$version.tar.bz2
 # If there are no patches, simply comment this
 #patch[0]=
@@ -19,8 +19,9 @@ source[0]=$topdir-$version.tar.bz2
 . ${HOME}/buildpkg/scripts/buildpkg.functions
 
 # Global settings
-export LDFLAGS="-R/usr/local/lib"
-shortroot=1
+export CPPFLAGS="-I$prefix/include"
+export LDFLAGS="-L$prefix/lib -R$prefix/lib"
+ignore_deps="LWperl"
 
 reg prep
 prep()
@@ -37,8 +38,8 @@ build()
 reg install
 install()
 {
-    generic_install prefix
-    doc FAQ README NEWS doc/*.ps
+    generic_install DESTDIR
+    doc FAQ README NEWS COPYING* doc/*.pdf
 }
 
 reg pack
diff --git a/cvs/meta/pkgdef b/cvs/meta/pkgdef
index de3e046..7dfdb55 100644
--- a/cvs/meta/pkgdef
+++ b/cvs/meta/pkgdef
@@ -1,9 +1,13 @@
 [cvs]
-pkgname="$pkgprefix""$topdir"
-name="CVS - Version control system"
+pkgname="${pkgprefix}${topdir}"
+name="${topdir} - Concurrent Versions System"
 pkgcat="application"
 pkgvendor="http://www.cvshome.org"
 pkgdesc="Lets you record the history of source files and documents"
 pkgver="$pkgver"
 files(-,root,bin)
-*
+default_docs
+$_bindir
+$_mandir
+$_infodir
+$_sharedir/cvs
diff --git a/cvs/meta/relnotes b/cvs/meta/relnotes
new file mode 100644
index 0000000..bd83629
--- /dev/null
+++ b/cvs/meta/relnotes
@@ -0,0 +1,27 @@
+PACKAGE DETAILS
+---------------
+Name:	    %%PKGNAME%%
+Version:    %%SOURCE_AND_VER%%
+Vendor:	    %%VENDOR%%
+Packager:   %%PKGEDBY%%
+
+Source (sha1sum):
+%%SOURCE_SHA1SUM%%
+
+BUILD DETAILS
+-------------
+Compiler:
+%%COMPILER%%
+
+Environment:
+%%ENVIRONMENT%%
+
+Configure:
+%%CONFIGURE%%
+
+KNOWN DEPENDENCIES
+------------------
+%%DEPENDENCIES%%
+
+ERRORS/MISCELLANEOUS
+--------------------