diff --git a/scripts/unpack b/scripts/unpack
index 6cd837bd7..a3e9d3455 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -64,8 +64,8 @@ if [ -n "$PKG_URL" ]; then
 fi
 
 if [ -d "$PKG_DIR/sources" ]; then
-  [ ! -d "$BUILD/$1*" ] && mkdir -p $BUILD/$1
-  cp -PRf $PKG_DIR/sources/* $BUILD/$1*/
+  [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+  cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
 fi
 
 [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`