diff --git a/board/orangepi_pc/wpa_supplicant.config b/board/orangepi_pc/wpa_supplicant.config
new file mode 100644
index 0000000..e192cb2
--- /dev/null
+++ b/board/orangepi_pc/wpa_supplicant.config
@@ -0,0 +1,23 @@
+CONFIG_BACKEND=file
+CONFIG_CTRL_IFACE=y
+CONFIG_DEBUG_FILE=y
+CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+CONFIG_DRIVER_NL80211=y
+CONFIG_DRIVER_WEXT=y
+CONFIG_DRIVER_WIRED=y
+CONFIG_EAP_GTC=y
+CONFIG_EAP_LEAP=y
+CONFIG_EAP_MD5=y
+CONFIG_EAP_MSCHAPV2=y
+CONFIG_EAP_OTP=y
+CONFIG_EAP_PEAP=y
+CONFIG_EAP_TLS=y
+CONFIG_EAP_TTLS=y
+CONFIG_IEEE8021X_EAPOL=y
+CONFIG_IPV6=y
+CONFIG_LIBNL32=y
+CONFIG_PEERKEY=y
+CONFIG_PKCS12=y
+CONFIG_SMARTCARD=y
+CONFIG_WPS=y
diff --git a/scripts/bash.sh b/scripts/bash.sh
index 341b047..c074e8d 100644
--- a/scripts/bash.sh
+++ b/scripts/bash.sh
@@ -9,8 +9,15 @@ bash() {
     pkgver=5.2.32
     srcurl=https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing bash"
-    mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/build_image.sh b/scripts/build_image.sh
index 1bdd90f..234d552 100755
--- a/scripts/build_image.sh
+++ b/scripts/build_image.sh
@@ -25,12 +25,16 @@
 . ./scripts/zlib.sh
 . ./scripts/nginx.sh
 . ./scripts/duf_bin.sh
+. ./scripts/curl.sh
+. ./scripts/dnsmasq.sh
+. ./scripts/git.sh
+. ./scripts/sftp_server.sh
+. ./scripts/uclibc.sh
+. ./scripts/bash.sh
 
 case $1 in
     build)
-        if [ ! -d downloads ]; then
-            download_sources
-        fi
+        [ ! -d downloads ] && mkdir $root/downloads
         rootfs
         if [ "$IMAGE_USABLE_ENABLE" = "y" ]; then
             sdroot_usable
@@ -100,6 +104,24 @@ case $1 in
     duf_bin)
         duf_bin
         ;;
+    curl)
+        curl
+        ;;
+    dnsmasq)
+        dnsmasq
+        ;;
+    git)
+        git_build
+        ;;
+    sftp_server)
+        sftp_server
+        ;;
+    uclibc)
+        uclibc
+        ;;
+    bash)
+        bash
+        ;;
     *)
         printf "$UYELLOW** $0 script using: $0 {clean|build|download|rootfs}\n$RESET"
         exit 1
diff --git a/scripts/busybox.sh b/scripts/busybox.sh
index 9d5fd85..e1add38 100755
--- a/scripts/busybox.sh
+++ b/scripts/busybox.sh
@@ -10,10 +10,20 @@
 
 #----------- Building busybox for rootfs ----------
 busybox_rootfs() {
+    pkgname=busybox
+    pkgver=${BUSYBOX_VERSION}
+    srcurl=https://busybox.net/downloads/${pkgname}-${pkgver}.tar.bz2
     print_info "** Building busybox for rootfs"
     [ -d $build/busybox ] && return 0
     mkdir -p $build/busybox
     cd $build/busybox
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.bz2 ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xjf $root/downloads/busybox-${BUSYBOX_VERSION}.tar.bz2
     cd busybox-${BUSYBOX_VERSION}
     sed -i 's/|| ctx->process_block == sha1_process_block64_shaNI/|| ctx->process_block == sha1_process_block64/' libbb/hash_md5_sha.c
diff --git a/scripts/curl.sh b/scripts/curl.sh
index b64f1a3..15848bd 100644
--- a/scripts/curl.sh
+++ b/scripts/curl.sh
@@ -13,8 +13,16 @@ curl() {
     pkgver=8.9.1
     srcurl=https://curl.se/download/${pkgname}-${pkgver}.tar.xz
     print_info "** Building and installing curl"
-    mkdir $build/${pkgname}
+    [ -d $build/${pkgname} ] && return 0
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.xz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/dnsmasq.sh b/scripts/dnsmasq.sh
index ad0e93d..d8600fc 100644
--- a/scripts/dnsmasq.sh
+++ b/scripts/dnsmasq.sh
@@ -9,8 +9,15 @@ dnsmasq() {
     pkgver=2.90
     srcurl=https://thekelleys.org.uk/${pkgname}/${pkgname}-${pkgver}.tar.xz
     print_info "** Building and installing $pkgname"
-    [ ! -d $build/$pkgname ] && mkdir $build/$pkgname
+    mkdir -p $build/$pkgname
     cd $build/$pkgname
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.xz
     cd ${pkgname}-${pkgver}
     make CC=${CROSS_COMPILE}-gcc ${makeflags}
diff --git a/scripts/dropbear.sh b/scripts/dropbear.sh
index c35e934..05b440a 100644
--- a/scripts/dropbear.sh
+++ b/scripts/dropbear.sh
@@ -6,11 +6,22 @@
 . ./scripts/zlib.sh
 
 dropbear() {
+    pkgname=dropbear
+    pkgver=2025.89
+    _archive=DROPBEAR_2025.89.tar.gz
+    srcurl=https://github.com/mkj/dropbear/archive/refs/tags/DROPBEAR_2025.89.tar.gz
     print_info "** Building and installing dropbear"
     [ -d $build/dropbear ] && return 0
-    mkdir $build/dropbear
+    mkdir -p $build/dropbear
     cd $build/dropbear
-    tar -xf $root/downloads/DROPBEAR_2025.89.tar.gz
+    if [ ! -f $root/downloads/${_archive} ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
+    tar -xf $root/downloads/${_archive}
     check $? "Extract dropbear"
     cd dropbear-DROPBEAR_2025.89
     if [ "${ZLIB_ENABLE}" = "n" ]; then
diff --git a/scripts/duf_bin.sh b/scripts/duf_bin.sh
index 6723dba..c5a4a90 100644
--- a/scripts/duf_bin.sh
+++ b/scripts/duf_bin.sh
@@ -9,7 +9,7 @@ duf_bin() {
     pkgver=0.9.1
     print_info "** Building and installing ${pkgname}"
     [ -d $build/${pkgname} ] && return 0
-    mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
     if [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "x86_64" ]; then
         wget https://github.com/muesli/duf/releases/download/v${pkgver}/${pkgname}_${pkgver}_linux_${ARCH}.tar.gz
diff --git a/scripts/finit_init.sh b/scripts/finit_init.sh
index bfe9337..f978267 100644
--- a/scripts/finit_init.sh
+++ b/scripts/finit_init.sh
@@ -7,7 +7,7 @@
 finit_init() {
     print_info "** Building and installing finit"
     [ -d $build/finit ] && return 0
-    mkdir -pv $build/finit
+    mkdir -p $build/finit
     cd $build/finit
     if [ ! -d libite ]; then
       git clone https://gitea.home.com:3000/TolaMironcenko/libite.git
diff --git a/scripts/git.sh b/scripts/git.sh
index 5e6c01f..8bec99b 100644
--- a/scripts/git.sh
+++ b/scripts/git.sh
@@ -13,8 +13,16 @@ git_build() {
     pkgver=2.46.0
     srcurl=https://www.kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.xz
     print_info "** Building and installing ${pkgname}"
-    mkdir $build/git
+    [ -d $build/${pkgname} ] && return 0
+    mkdir -p $build/git
     cd $build/git
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.xz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/hostapd.sh b/scripts/hostapd.sh
index 7f61af7..b6bc075 100644
--- a/scripts/hostapd.sh
+++ b/scripts/hostapd.sh
@@ -13,8 +13,15 @@ hostapd() {
     pkgver=2.11
     srcurl=https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing ${pkgname}"
-    [ ! -d $build/${pkgname} ] && mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     cd ${pkgname}-${pkgver}/${pkgname}
     sed -i "/CONFIG_EAP_TLS=y/s//#CONFIG_EAP_TLS=y/" defconfig
diff --git a/scripts/iptables.sh b/scripts/iptables.sh
index caf3d70..a6347c6 100644
--- a/scripts/iptables.sh
+++ b/scripts/iptables.sh
@@ -9,8 +9,16 @@ iptables() {
     pkgver=1.8.11
     srcurl=https://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.xz
     print_info "** Building and installing $pkgname"
-    [ ! -d $build/$pkgname ] && mkdir $build/$pkgname
+    [ -d $build/${pkgname} ] && return 0
+    mkdir -p $build/$pkgname
     cd $build/$pkgname
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.xz
     cd ${pkgname}-${pkgver}
     ./configure \
diff --git a/scripts/iw.sh b/scripts/iw.sh
index c193d44..c5bdca5 100644
--- a/scripts/iw.sh
+++ b/scripts/iw.sh
@@ -11,8 +11,15 @@ iw() {
     pkgver=6.9
     srcurl=https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz
     print_info "** Building and installing ${pkgname}"
-    [ ! -d $build/iw ] && mkdir $build/iw
+    mkdir -p $build/iw
     cd $build/iw
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.xz
     cd ${pkgname}-${pkgver}
     CC=${CROSS_COMPILE}-gcc \
diff --git a/scripts/kernel.sh b/scripts/kernel.sh
index ae0149a..d360859 100755
--- a/scripts/kernel.sh
+++ b/scripts/kernel.sh
@@ -64,10 +64,18 @@ kernel_with_rootfs() {
 #-----------------------------------------------------------
 
 kernel_headers() {
+    srcurl=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${KERNEL_VERSION}.tar.xz
     print_info "** Building Linux Kernel headers"
     [ -d $build/kernel-headers ] && return 0
     [ ! -d $build/kernel-headers ] && mkdir $build/kernel-headers
     cd $build/kernel-headers
+    if [ ! -f $root/downloads/linux-${KERNEL_VERSION}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/linux-$KERNEL_VERSION.tar.xz
     check $? "Extract Linux Kernel"
     cd linux-$KERNEL_VERSION
diff --git a/scripts/libnl.sh b/scripts/libnl.sh
index d1e83a2..3f8a7a1 100644
--- a/scripts/libnl.sh
+++ b/scripts/libnl.sh
@@ -10,8 +10,16 @@ libnl() {
     _upkgver=3_10_0
     srcurl=https://github.com/thom311/libnl/releases/download/${pkgname}${_upkgver}/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing ${pkgname}"
-    [ ! -d $build/${pkgname} ] && mkdir $build/${pkgname}
+    [ -d $build/${pkgname} ] && return 0
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/libsqlite3.sh b/scripts/libsqlite3.sh
index d95383e..b076661 100644
--- a/scripts/libsqlite3.sh
+++ b/scripts/libsqlite3.sh
@@ -9,7 +9,7 @@ libsqlite3() {
     pkgver=3.10.0
     giturl=https://github.com/LuaDist/libsqlite3.git
     print_info "** Building and installing ${pkgname}"
-    [ ! -d $build/${pkgname} ] && mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
     git clone ${giturl}
     check $? "Download ${pkgname}"
diff --git a/scripts/lm_sensors.sh b/scripts/lm_sensors.sh
index f7c1d8a..be85235 100644
--- a/scripts/lm_sensors.sh
+++ b/scripts/lm_sensors.sh
@@ -7,7 +7,7 @@
 lm_sensors() {
     print_info "** Building and installing lm_sensors"
     [ -d $build/lm_sensors ] && return 0
-    mkdir -pv $build/lm_sensors
+    mkdir -p $build/lm_sensors
     cd $build/lm_sensors
     git clone https://github.com/lm-sensors/lm-sensors.git
     cd lm-sensors
diff --git a/scripts/lrzsz.sh b/scripts/lrzsz.sh
index 8a7e2d7..9a1f3fc 100644
--- a/scripts/lrzsz.sh
+++ b/scripts/lrzsz.sh
@@ -9,7 +9,7 @@ lrzsz-build() {
     pkgver=0.12.20
     print_info "** Building and installing ${pkgname}"
     [ -d $build/${pkgname} ] && return 0
-    mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     check $? "Extract ${pkgname}"
diff --git a/scripts/nginx.sh b/scripts/nginx.sh
index e1b5282..6a5fa54 100644
--- a/scripts/nginx.sh
+++ b/scripts/nginx.sh
@@ -10,8 +10,15 @@ nginx_build() {
     srcurl=https://github.com/nginx/nginx/releases/download/release-${pkgver}/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing ${pkgname}"
     [ -d $build/${pkgname} ] && return 0
-    mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/openssl.sh b/scripts/openssl.sh
index 49a9cd4..3cd9a47 100644
--- a/scripts/openssl.sh
+++ b/scripts/openssl.sh
@@ -12,22 +12,30 @@ openssl() {
     srcurl=https://github.com/openssl/openssl/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing ${pkgname}"
     [ -d $build/${pkgname} ] && return 0
-    [ ! -d $build/${pkgname} ] && mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     cd ${pkgname}-${pkgver}/
     if [ "$ARCH" = "arm" ]; then
-        ./config linux-armv4 CROSS_COMPILE=${CROSS_COMPILE}-
+        ./config linux-armv4 CROSS_COMPILE=${CROSS_COMPILE}- --prefix=/usr
     elif [ "$ARCH" = "arm64" ]; then
-        ./config linux-aarch64 no-async CROSS_COMPILE=${CROSS_COMPILE}-
+        ./config linux-aarch64 no-async CROSS_COMPILE=${CROSS_COMPILE}- --prefix=/usr
     elif [ "$ARCH" = "x86_64" ]; then
-        ./config linux-x86_64 CROSS_COMPILE=${CROSS_COMPILE}-
+        ./config linux-x86_64 CROSS_COMPILE=${CROSS_COMPILE}- --prefix=/usr
     fi
     check $? "Configure ${pkgname}"
     make ${makeflags}
     check $? "Build ${pkgname}"
-    cp -v libcrypto.so.3 libssl.so.3 $rootfspath/usr/lib/
-    ln -sv libcrypto.so.3 $rootfspath/usr/lib/libcrypto.so
-    ln -sv libssl.so.3 $rootfspath/usr/lib/libssl.so
+    # cp -v libcrypto.so.3 libssl.so.3 $rootfspath/usr/lib/
+    # ln -sv libcrypto.so.3 $rootfspath/usr/lib/libcrypto.so
+    # ln -sv libssl.so.3 $rootfspath/usr/lib/libssl.so
+    make DESTDIR=$rootfspath install
     check $? "Install to rootfs ${pkgname}"
 }
diff --git a/scripts/rootfs.sh b/scripts/rootfs.sh
index 1b0e482..1944b1a 100755
--- a/scripts/rootfs.sh
+++ b/scripts/rootfs.sh
@@ -79,7 +79,6 @@ EOF
     [ "$WPA_SUPPLICANT_ENABLE" = "y" ] && build_wpa_supplicant
     [ "$HOSTAPD_ENABLE" = "y" ] && hostapd
     [ "$IPTABLES_ENABLE" = "y" ] && iptables
-    [ "$KO8821AU_ENABLE" = "y" ] && ko8821au
     [ "$LIBSQLITE3_ENABLE" = "y"] && libsqlite3
     [ "$LM_SENSORS_ENABLE" = "y" ] && lm_sensors
     [ "$LRZSZ_ENABLE" = "y" ] && lrzsz-build
@@ -109,6 +108,7 @@ EOF
     cleanup_rootfs
     kernel
     kernel_modules
+    [ "$KO8821AU_ENABLE" = "y" ] && ko8821au
     if [ "${board}" = "orangepi_pc" ] && [ "${TCC_C_COMPILER_ENABLE}" = "y" ]
     then
         cd $rootfspath
diff --git a/scripts/sftp_server.sh b/scripts/sftp_server.sh
index 684124f..b0fbd7e 100644
--- a/scripts/sftp_server.sh
+++ b/scripts/sftp_server.sh
@@ -14,9 +14,17 @@ sftp_server() {
     fi
     print_info "** Building sftp-server"
     srcurl=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.9p1.tar.gz
+    _archive=openssh-9.9p1.tar.gz
     [ -d $build/sftp_server ] && return 0
     mkdir -p $build/sftp_server
     cd $build/sftp_server
+    if [ ! -f $root/downloads/${_archive} ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/openssh-9.9p1.tar.gz
     check $? "Extract openssh"
     cd openssh-9.9p1
diff --git a/scripts/tcc.sh b/scripts/tcc.sh
index 60954ec..a905848 100644
--- a/scripts/tcc.sh
+++ b/scripts/tcc.sh
@@ -9,8 +9,15 @@ tcc_build() {
     pkgver=0.9.27
     srcurl=https://download.savannah.gnu.org/releases/tinycc/${pkgname}-${pkgver}.tar.bz2
     print_info "** Building and installing ${pkgname}"
-    mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.bz2 ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.bz2
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/uclibc.sh b/scripts/uclibc.sh
index a8f75a1..8e3dc98 100755
--- a/scripts/uclibc.sh
+++ b/scripts/uclibc.sh
@@ -13,6 +13,13 @@ uclibc() {
     [ -d $build/${pkgname} ] && return 0
     mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.xz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.xz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}
diff --git a/scripts/wpa_supplicant.sh b/scripts/wpa_supplicant.sh
index f24b324..ebcf027 100755
--- a/scripts/wpa_supplicant.sh
+++ b/scripts/wpa_supplicant.sh
@@ -11,11 +11,18 @@ build_wpa_supplicant() {
     [ ! -d $build/openssl ] && openssl
     pkgname=wpa_supplicant
     pkgver=2.11
-    srcurl=https://w1.fi/releases/wpa_supplicant-2.11.tar.gz
+    srcurl=https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing iw"
     [ -d $build/wpa_supplicant ] && return 0
-    [ ! -d $build/wpa_supplicant ] && mkdir $build/wpa_supplicant
+    mkdir -p $build/wpa_supplicant
     cd $build/wpa_supplicant
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     cd ${pkgname}-${pkgver}/wpa_supplicant
     cp $root/board/${BOARD_NAME}/wpa_supplicant.config .config
diff --git a/scripts/zlib.sh b/scripts/zlib.sh
index c62fd31..107c7e5 100644
--- a/scripts/zlib.sh
+++ b/scripts/zlib.sh
@@ -6,12 +6,19 @@
 
 zlib() {
     pkgname=zlib
-    pkgver=1.3.1
-    srcurl=https://www.zlib.net/zlib-1.3.1.tar.gz
+    pkgver=1.3.2
+    srcurl=https://www.zlib.net/${pkgname}-${pkgver}.tar.gz
     print_info "** Building and installing ${pkgname}"
     [ -d $build/${pkgname} ] && return 0
-    mkdir $build/${pkgname}
+    mkdir -p $build/${pkgname}
     cd $build/${pkgname}
+    if [ ! -f $root/downloads/${pkgname}-${pkgver}.tar.gz ]; then
+        print_info "** Downloading $srcurl"
+        cd $root/downloads
+        wget $srcurl
+        check $? "download $srcurl"
+        cd -
+    fi
     tar -xf $root/downloads/${pkgname}-${pkgver}.tar.gz
     check $? "Extract ${pkgname}"
     cd ${pkgname}-${pkgver}