diff --git a/mingw-w64-tcllib/PKGBUILD b/mingw-w64-tcllib/PKGBUILD
index 884dbd484a..faf2a83d24 100644
--- a/mingw-w64-tcllib/PKGBUILD
+++ b/mingw-w64-tcllib/PKGBUILD
@@ -16,11 +16,14 @@ md5sums=('6ebc460a3f5bfb09eb722bf123165c24')
 
 package(){
   cd ${srcdir}/tcllib-tcllib_${pkgver/./_}
-  tclsh installer.tcl -pkg-path ${pkgdir}${MINGW_PREFIX}/lib/tcllib${pkgver} \
-	-app-path ${pkgdir}${MINGW_PREFIX}/bin \
-	-nroff-path ${pkgdir}${MINGW_PREFIX}/share/man/mann \
-	-no-examples -no-html \
-	-no-wait  -no-gui
+  tclsh installer.tcl \
+    -pkg-path ${pkgdir}${MINGW_PREFIX}/lib/tcllib${pkgver} \
+    -app-path ${pkgdir}${MINGW_PREFIX}/bin \
+    -nroff-path ${pkgdir}${MINGW_PREFIX}/share/man/mann \
+    -no-examples \
+    -no-html \
+    -no-wait \
+    -no-gui
   mkdir -p ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/
   cp license.terms ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING
   rm -f $pkgdir${MINGW_PREFIX}/share/man/mann/{try,string,variable,zlib,coroutine}.n
diff --git a/mingw-w64-tclvfs/PKGBUILD b/mingw-w64-tclvfs/PKGBUILD
index 4fa2604677..a5498c8a1d 100644
--- a/mingw-w64-tclvfs/PKGBUILD
+++ b/mingw-w64-tclvfs/PKGBUILD
@@ -1,7 +1,7 @@
 # Based on Arch's PKGBUILD
 
-_realname=tclvfs-cvs
-pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
+_realname=tclvfs
+pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-cvs
 pkgver=20130425
 pkgrel=1
 pkgdesc="Virtual Filesystem support for Tcl"
@@ -15,11 +15,11 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-tclvfs")
 md5sums=() #generate with 'makepkg -g'
 
 _cvsroot=":pserver:anonymous:@tclvfs.cvs.sourceforge.net:/cvsroot/tclvfs"
-_cvsmod="tclvfs"
+_cvsmod="${_realname}"
 
 _build="$srcdir/$_cvsmod-build${CARCH}"
 
-build() {
+prepare() {
   cd "$srcdir"
   msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
   if [ -d $_cvsmod/CVS ]; then
@@ -27,17 +27,21 @@ build() {
     cvs -z3 update -d
   else
     cvs -z3 -d $_cvsroot co -D $pkgver -f $_cvsmod
-    cd $_cvsmod
   fi
 
   msg "CVS checkout done or server timeout"
+}
+
+build() {
   msg "Starting build..."
 
   rm -rf "$_build"
   cp -r "$srcdir/$_cvsmod" "$_build"
 
   cd "$_build"
-  ./configure --prefix=${MINGW_PREFIX}
+  ./configure \
+    --prefix=${MINGW_PREFIX} \
+    --mandir=${MINGW_PREFIX}/share/man
   make
 }