diff --git a/scripts/unpack b/scripts/unpack
index 84a8dad826..c76fd7f069 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -87,7 +87,7 @@ fi
 
 if [ -n "$PKG_SOURCE_DIR" ]; then
   mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-elif [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
+elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* -a ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
   mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
 fi