diff --git a/scripts/unpack b/scripts/unpack
index 467d1e67de..8f058bf3ea 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -48,6 +48,9 @@ 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}`
+
 for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
   if [ -f $i ]; then
     PATCH=`basename $i`
@@ -57,12 +60,12 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
       continue;
     else
       echo "## Applying patch: $i"
-      cat $i | patch -d `echo $BUILD/$1* | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
+      cat $i | patch -d `echo $PKG_BUILD | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
     fi
   fi
 done
 
-$SCRIPTS/fixconfigtools $BUILD/$1*
+$SCRIPTS/fixconfigtools $PKG_BUILD
 
 [ -f $PKG_DIR/unpack ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT