diff --git a/packages/audio/espeak/package.mk b/packages/audio/espeak/package.mk
index 2e842babd5..45622936e1 100644
--- a/packages/audio/espeak/package.mk
+++ b/packages/audio/espeak/package.mk
@@ -23,7 +23,6 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://espeak.sourceforge.net/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
-PKG_SOURCE_DIR="$PKG_NAME/$PKG_NAME-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
diff --git a/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk b/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk
index e15d79f867..3fe4f0c2bb 100644
--- a/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk
+++ b/packages/tools/imx6-mfgtool2-tbs-matrix/package.mk
@@ -23,7 +23,6 @@ PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/matrixtv/"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
-PKG_SOURCE_DIR="$PKG_NAME"
 PKG_DEPENDS_TARGET=""
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
diff --git a/scripts/extract b/scripts/extract
index 891fc65295..44cfef8375 100755
--- a/scripts/extract
+++ b/scripts/extract
@@ -57,8 +57,7 @@ for i in $PKG_URL; do
         7z x -o$3/$1 $f
         ;;
       *.zip)
-        mkdir -p $3/$1
-        unzip -q $f -d $3/$1
+        unzip -q $f -d $3
         ;;
       *.diff | *.patch)
         cat $f | patch -d $3 -p1
diff --git a/scripts/image b/scripts/image
index 6ff74ded0d..ecf5e51bc3 100755
--- a/scripts/image
+++ b/scripts/image
@@ -271,7 +271,7 @@ fi
           $SCRIPTS/unpack imx6-mfgtool2-tbs-matrix
 
           mkdir -p $RELEASE_DIR/MfgTool2-TBS-Matrix
-          cp -PR $BUILD/imx6-mfgtool2-tbs-matrix-*/imx6-mfgtool2-tbs-matrix-*/* $RELEASE_DIR/MfgTool2-TBS-Matrix
+          cp -PR $BUILD/imx6-mfgtool2-tbs-matrix-*/* $RELEASE_DIR/MfgTool2-TBS-Matrix
         fi
 
         cp $ROOT/README* $RELEASE_DIR