diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto
index dc289e9..83518de 100644
--- a/prototypes/PKGBUILD-cvs.proto
+++ b/prototypes/PKGBUILD-cvs.proto
@@ -28,7 +28,7 @@ _cvsroot="CVSROOT"
 _cvsmod="MODNAME"
 
 build() {
-  cd $startdir/src
+  cd "$srcdir"
   msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
   if [ -d $_cvsmod/CVS ]; then
     cd $_cvsmod
@@ -41,7 +41,7 @@ build() {
   msg "CVS checkout done or server timeout"
   msg "Starting make..."
 
-  rm -r $startdir/src/$_cvsmod-build
+  rm -r "$srcdir/$_cvsmod-build"
   cp -r ../$_cvsmod ../$_cvsmod-build
   cd ../$_cvsmod-build
 
@@ -53,5 +53,5 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR="$pkgdir/" install || return 1
 }
diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto
index e83444a..0968ed7 100644
--- a/prototypes/PKGBUILD-darcs.proto
+++ b/prototypes/PKGBUILD-darcs.proto
@@ -28,7 +28,7 @@ _darcstrunk="DARCSURL"
 _darcsmod="MODNAME"
 
 build() {
-  cd $startdir/src/
+  cd "$srcdir"
 
   msg "Checking for previous build"
 
@@ -43,9 +43,9 @@ build() {
     cd $_darcsmod
   fi
 
-  rm -r $startdir/src/$_darcsmod-build
-  cp -r $startdir/src/$_darcsmod $startdir/src/$_darcsmod-build
-  cd $startdir/src/$_darcsmod-build
+  rm -r "$srcdir/$_darcsmod-build"
+  cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build"
+  cd "$srcdir/$_darcsmod-build"
 
   msg "Starting build"
 
@@ -56,5 +56,5 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg/ install
+  make DESTDIR="$pkgdir/" install
 }
diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto
index 5e6fdd0..268fa43 100644
--- a/prototypes/PKGBUILD-git.proto
+++ b/prototypes/PKGBUILD-git.proto
@@ -28,10 +28,10 @@ _gitroot="GITURL"
 _gitname="MODENAME"
 
 build() {
-  cd $startdir/src
+  cd "$srcdir"
   msg "Connecting to GIT server...."
 
-  if [ -d $startdir/src/$_gitname ] ; then
+  if [ -d "$srcdir/$_gitname" ] ; then
     cd $_gitname && git-pull origin
     msg "The local files are updated."
   else
@@ -41,9 +41,9 @@ build() {
   msg "GIT checkout done or server timeout"
   msg "Starting make..."
 
-  rm -r $startdir/src/$_gitname-build
-  cp -r $startdir/src/$_gitname $startdir/src/$_gitname-build
-  cd $startdir/src/$_gitname-build
+  rm -r "$srcdir/$_gitname-build"
+  cp -r "$srcdir/$_gitname $startdir/src/$_gitname-build"
+  cd "$srcdir/$_gitname-build"
 
   #
   # BUILD HERE
@@ -52,5 +52,5 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg/ install
+  make DESTDIR="$pkgdir/" install
 } 
diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto
index f664f5d..db5f3b5 100644
--- a/prototypes/PKGBUILD-svn.proto
+++ b/prototypes/PKGBUILD-svn.proto
@@ -28,7 +28,7 @@ _svntrunk=SVNURL
 _svnmod=MODENAME
 
 build() {
-  cd $startdir/src
+  cd "$srcdir"
 
   if [ -d $_svnmod/.svn ]; then
     (cd $_svnmod && svn up -r $pkgver)
@@ -39,7 +39,7 @@ build() {
   msg "SVN checkout done or server timeout"
   msg "Starting make..."
 
-  rm -r $startdir/src/$_svnmod-build
+  rm -r "$srcdir/$_svnmod-build"
   cp -r $_svnmod $_svnmod-build
   cd $_svnmod-build
 
@@ -49,5 +49,5 @@ build() {
   ./autogen.sh
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg/ install
+  make DESTDIR="$pkgdir/" install
 }