diff --git a/addresses/PKGBUILD b/addresses/PKGBUILD
index 1db19a1..5f5e694 100644
--- a/addresses/PKGBUILD
+++ b/addresses/PKGBUILD
@@ -18,13 +18,13 @@ source=(http://savannah.nongnu.org/download/gap/$_pkgname-$pkgver.tar.gz)
 md5sums=('35c929e3d2361ab26e3387fa07ca1d29')
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
   install -D -m644 "$pkgdir/usr/lib/GNUstep/Applications/$__pkgname.app/Resources/$__pkgname.desktop" \
     "$pkgdir/usr/share/applications/$__pkgname.desktop"
diff --git a/gnumail/PKGBUILD b/gnumail/PKGBUILD
index 2147e06..334662f 100644
--- a/gnumail/PKGBUILD
+++ b/gnumail/PKGBUILD
@@ -17,17 +17,13 @@ source=(http://download.gna.org/gnustep-nonfsf/$_pkgname-$pkgver.tar.gz)
 md5sums=('c2cc13b7c13d96b83520be5671531ed3')
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
-  # necessary to set environment if not in user startup.
-  #. /opt/GNUstep/System/Library/Makefiles/GNUstep.sh
+  cd "$srcdir/$_pkgname-$pkgver"
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  #./configure --prefix=/usr/share/GNUstep
-  #./configure
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
   install -D -m644 "$pkgdir/usr/lib/GNUstep/Applications/$_pkgname.app/Resources/$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/gworkspace/PKGBUILD b/gworkspace/PKGBUILD
index d05d134..886b516 100644
--- a/gworkspace/PKGBUILD
+++ b/gworkspace/PKGBUILD
@@ -18,17 +18,14 @@ source=(ftp://ftp.gnustep.org/pub/gnustep/usr-apps/$pkgname-$pkgver.tar.gz)
 md5sums=('406256f470781bc3be2670611276780f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  # necessary to set environment if not in user startup.
-  #. /opt/GNUstep/System/Library/Makefiles/GNUstep.sh
+  cd "$srcdir/$pkgname-$pkgver"
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  #./configure --prefix=/usr/share/GNUstep
   ./configure
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
   install -D -m644 "$pkgdir/usr/lib/GNUstep/Applications/$_pkgname.app/Resources/$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/simpleagenda-git/PKGBUILD b/simpleagenda-git/PKGBUILD
index 63be312..50ff7b4 100644
--- a/simpleagenda-git/PKGBUILD
+++ b/simpleagenda-git/PKGBUILD
@@ -18,18 +18,18 @@ source=('src::git+https://github.com/poroussel/simpleagenda')
 md5sums=('SKIP')
 
 pkgver() {
-  cd $srcdir
+  cd "$srcdir"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd $srcdir/src
+  cd "$srcdir/src"
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
   make
 }
 
 package() {
-  cd $srcdir/src
+  cd "$srcdir/src"
   make DESTDIR="$pkgdir/" install
   install -D -m644 "$pkgdir/usr/lib/GNUstep/Applications/$_pkgname.app/Resources/$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/systempreferences-svn/PKGBUILD b/systempreferences-svn/PKGBUILD
index 6de4398..360af6d 100644
--- a/systempreferences-svn/PKGBUILD
+++ b/systempreferences-svn/PKGBUILD
@@ -23,13 +23,13 @@ pkgver() {
 }
 
 build() {
-  cd $srcdir/$pkgname
+  cd "$srcdir/$pkgname"
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
   make
 }
 
 package() {
-  cd $srcdir/$pkgname
+  cd "$srcdir/$pkgname"
   make DESTDIR="$pkgdir/" install
   install -D -m644 "$pkgdir/usr/lib/GNUstep/Applications/$_pkgname.app/Resources/$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/zipper/PKGBUILD b/zipper/PKGBUILD
index a74593f..f0e2b51 100644
--- a/zipper/PKGBUILD
+++ b/zipper/PKGBUILD
@@ -17,13 +17,13 @@ source=(http://savannah.nongnu.org/download/gap/$_pkgname-$pkgver.tar.gz)
 md5sums=('2281adff0815920db61f24c1cf5fb56d')
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
   install -D -m644 "$pkgdir/usr/lib/GNUstep/Applications/$_pkgname.app/Resources/$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"