diff --git a/Makefile.in b/Makefile.in
index 630fbac71..dfbc8bb54 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -565,7 +565,7 @@ install_unix: startup.yss libYap.a
 	@INSTALL_DLLS@ (cd packages/sgml; $(MAKE) install)
 	@INSTALL_DLLS@ (cd packages/RDF; $(MAKE) install)
 	@INSTALL_DLLS@ (cd packages/semweb; $(MAKE) install)
-	@INSTALL_DLLS@ (cd packages/zlib; $(MAKE) install)
+	@INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
 	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@@ -618,7 +618,7 @@ install_win32: startup.yss
 	(cd packages/RDF; $(MAKE) install)
 	(cd packages/sgml; $(MAKE) install)
 	(cd packages/semweb; $(MAKE) install)
-	(cd packages/zlib; $(MAKE) install)
+	(cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
 	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
 	@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
diff --git a/configure b/configure
index 2663da1a9..80c4551c3 100755
--- a/configure
+++ b/configure
@@ -652,6 +652,7 @@ INSTALL_DLLS
 ARCH
 M4GENHDRS
 M4
+ZLIB_INSTALL
 ZLIB_PLTARGETS
 ZLIB_TARGETS
 ZLIBS
@@ -3849,6 +3850,7 @@ if test "${with_gmp+set}" = set; then :
 	else
 		yap_cv_gmp=$with_gmp
 		LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib"
+		LIBS="$LIBS -L${yap_cv_gmp}/lib"
 		CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include"
 		CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
 	fi
@@ -5183,6 +5185,11 @@ _ACEOF
 fi
 
     yap_cv_readline=no
+    if test "$target_win64" = yes
+	CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
+    then
+	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
+    fi
     if test "$prefix" = "NONE"
     then
       if test "$target_win64" = yes
@@ -5191,7 +5198,6 @@ fi
 	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
       else
         prefix="\${SYSTEMDRIVE}/Yap"
-	CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
       fi
     fi
     ENABLE_WINCONSOLE=""
@@ -7361,8 +7367,10 @@ fi
 if test "$ZLIB" = yes; then
   ZLIB_TARGETS="zlib4pl.$SO"
   ZLIB_PLTARGETS='$(srcdir)/zlib.pl'
+  ZLIB_INSTALL=install
 else
   ZLIB_TARGETS=nolib
+  ZLIB_INSTALL=nolib
   cat << EOF
 ##################################################################
 # ERROR: Could not find library zlib (-lz).  Dropped library(zlib)
@@ -7378,6 +7386,7 @@ fi
 
 
 
+
 # LAM
 OLD_CC=${CC}
 CC=${LAM_MPI_CC}
diff --git a/configure.in b/configure.in
index 8aac41883..3ac01ca3c 100755
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,7 @@ AC_ARG_WITH(gmp,
 	else
 		yap_cv_gmp=$with_gmp
 		LDFLAGS="$LDFLAGS -L${yap_cv_gmp}/lib"
+		LIBS="$LIBS -L${yap_cv_gmp}/lib"

 		CPPFLAGS="$CPPFLAGS -I${yap_cv_gmp}/include"
 		CFLAGS="$CFLAGS -I${yap_cv_gmp}/include"
 	fi,
@@ -560,6 +561,11 @@ then
     fi
     AC_CHECK_LIB(psapi,main)
     yap_cv_readline=no
+    if test "$target_win64" = yes

+	CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"

+    then

+	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"

+    fi

     if test "$prefix" = "NONE"
     then
       if test "$target_win64" = yes
@@ -568,7 +574,6 @@ then
 	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
       else
         prefix="\${SYSTEMDRIVE}/Yap"
-	CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
       fi
     fi
     ENABLE_WINCONSOLE=""   
@@ -1272,8 +1277,10 @@ AC_CHECK_LIB(z, zlibVersion,
 if test "$ZLIB" = yes; then
   ZLIB_TARGETS="zlib4pl.$SO"
   ZLIB_PLTARGETS='$(srcdir)/zlib.pl'
+  ZLIB_INSTALL=install
 else
   ZLIB_TARGETS=nolib
+  ZLIB_INSTALL=nolib
   cat << EOF
 ##################################################################
 # ERROR: Could not find library zlib (-lz).  Dropped library(zlib)
@@ -1287,6 +1294,7 @@ fi
 AC_SUBST(ZLIBS)
 AC_SUBST(ZLIB_TARGETS)
 AC_SUBST(ZLIB_PLTARGETS)
+AC_SUBST(ZLIB_INSTALL)
 
 
 # LAM