diff --git a/packages/audio/espeak/package.mk b/packages/audio/espeak/package.mk
index 45622936e1..497641e284 100644
--- a/packages/audio/espeak/package.mk
+++ b/packages/audio/espeak/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://espeak.sourceforge.net/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
+PKG_URL="http://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/$PKG_NAME-$PKG_VERSION.zip"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index 3c3f86e516..dade2b01d4 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.zlib.net"
-PKG_URL="$DISTRO_MIRROR/zlib/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST=""
 PKG_PRIORITY="optional"
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