diff --git a/defaults.sh b/defaults.sh
index dad724c9..f8ce9782 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -210,7 +210,7 @@ GNUTLS_VERSION="3.2.19"
 set_default BUILD_GNUTLS_FROM_SOURCE "no"
 set_default GNUTLS_URL  "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"
 set_default GNUTLS_DEV_URL  "$GC_DEPS_URL/gnutls-3.2.19-dev-minGW.tgz"
-set_default GNUTLS_SRC_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+set_default GNUTLS_PKG_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
 GCRYPT_VERSION="1.6.2"
 set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
 GPG_ERROR_VERSION="1.17"
diff --git a/install-impl.sh b/install-impl.sh
index cbe1bcd1..a1d3d309 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -459,10 +459,12 @@ function inst_gnutls() {
         echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
     else
         if [ "$BUILD_GNUTLS_FROM_SOURCE" = "yes" ]; then
-            wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+            mkdir -p $_GNUTLS_UDIR
+            wget_unpacked $GNUTLS_PKG_URL $DOWNLOAD_DIR $GNUTLS_DIR
             wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
             wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
             wget_unpacked $GLIB_NETWORKING_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+            rm $_GNUTLS_UDIR/lib/*.la
             assert_one_dir $TMP_UDIR/libgcrypt-*
             assert_one_dir $TMP_UDIR/libgpg-error-*
             assert_one_dir $TMP_UDIR/glib-networking-*