diff --git a/scripts/unpack b/scripts/unpack
index 48c6afb279..b2fe60ebf1 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -48,8 +48,8 @@ if [ -d "$PKG_DIR/sources" ]; then
   cp -PRf $PKG_DIR/sources/* $BUILD/$1*/
 fi
 
-[ -d "$BUILD/${PKG_NAME}[-_.]${PKG_VERSION}" ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
-[ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
+[ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
+[ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
 
 for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
   if [ -f "$i" ]; then
@@ -60,7 +60,7 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
       continue;
     else
       echo "## Applying patch: $i"
-      cat $i | patch -d `echo $PKG_BUILD | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
+      cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
     fi
   fi
 done