diff --git a/configure b/configure
old mode 100755
new mode 100644
index bb72fac31..4386edbc3
--- a/configure
+++ b/configure
@@ -5228,11 +5228,7 @@ _ACEOF
 fi
 
     yap_cv_readline=no
-    if test "$target_win64" = yes
-	CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
-    then
-	CLIB_NETLIBS="-lwsock32 -lpsapi -lgdi32"
-    fi
+    CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
     if test "$prefix" = "NONE"
     then
       if test "$target_win64" = yes
@@ -9331,8 +9327,8 @@ CHR_TARGETS=chr_support."$SO"
 
 
 
-CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO"
-CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl crypt.pl"
+CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO $CRYPT_TARGETS"
+CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl $CRYPT_TARGETS"
 
 if test "$ac_cv_func_setitimer" = "yes"; then
   CLIB_TARGETS="$CLIB_TARGETS time.$SO"
@@ -9529,12 +9525,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
 $as_echo "$ac_cv_lib_crypt_crypt" >&6; }
 if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
-
-  LIBS="-lcrypt $LIBS"
-
+  CRYPT_TARGET=crypt.\$SO
+else
+  CRYPT_TARGET=""
 fi
 
 CLIB_CRYPTLIBS="$LIBS"
diff --git a/configure.in b/configure.in
old mode 100755
new mode 100644
index b09fb396d..799983f18
--- a/configure.in
+++ b/configure.in
@@ -577,11 +577,7 @@ then
     EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS \$(abs_top_builddir)/yap.dll"
     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
+    CLIB_NETLIBS="-lws2_32 -lpsapi -lgdi32"
     if test "$prefix" = "NONE"
     then
       if test "$target_win64" = yes
@@ -1840,8 +1836,8 @@ AC_SUBST(TARGETS)
 AC_SUBST(PLTARGETS)
 AC_SUBST(CHR_TARGETS)
 
-CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO crypt.$SO"
-CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl crypt.pl"
+CLIB_TARGETS="random.$SO socket.$SO cgi.$SO memfile.$SO files.$SO mime.$SO $CRYPT_TARGETS"
+CLIB_PLTARGETS="random.pl socket.pl cgi.pl memfile.pl filesex.pl mime.pl $CRYPT_TARGETS"
 
 if test "$ac_cv_func_setitimer" = "yes"; then
   CLIB_TARGETS="$CLIB_TARGETS time.$SO"
@@ -1871,7 +1867,7 @@ AC_CHECK_LIB(pthread, pthread_create,
                       [CLIB_PTHREADS="-lpthread"],[CLIB_PTHREADS=""])
 
 oldlibs="$LIBS"
-AC_CHECK_LIB(crypt, crypt)
+AC_CHECK_LIB(crypt, crypt, CRYPT_TARGET=crypt.\$SO, CRYPT_TARGET="")
 CLIB_CRYPTLIBS="$LIBS"
 AC_CHECK_FUNCS(crypt)
 LIBS="$oldlibs"