diff --git a/configure b/configure
index ae2f7a710..586f8b896 100755
--- a/configure
+++ b/configure
@@ -6836,14 +6836,14 @@ fi
 	SHLIB_CFLAGS=""
         if test "$target_win64" = no
         then
-          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../.. yap.dll"
 	  LDFLAGS="-Wl,--large-address-aware $LDFLAGS"
+          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
         else
-	  SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../.. yap.dll $LIBS"
+          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll -lws2_32"
         fi
-        SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../../.. yap.dll"
-        SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols -L ../../.. yap.dll"
-        SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../..  -L ../../packages/PLStream yap.dll plstream.dll"
+        SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll"
+        SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll"
+        SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll  ../../packages/PLStream/plstream.dll"
 	SHLIB_SUFFIX=".dll"
 	C_PARSER_FLAGS="$C_INTERF_FLAGS"
 	EXEC_SUFFIX=".exe"
diff --git a/configure.in b/configure.in
index 03b506648..3a398f5e7 100755
--- a/configure.in
+++ b/configure.in
@@ -976,14 +976,14 @@ dnl Linux has both elf and a.out, in this case we found elf
 	SHLIB_CFLAGS=""
         if test "$target_win64" = no
         then
-          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../.. yap.dll"
 	  LDFLAGS="-Wl,--large-address-aware $LDFLAGS"
-        else				     
-	  SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../.. yap.dll $LIBS"
+          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll"
+        else
+          SHLIB_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll -lws2_32"
         fi
-        SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../../.. yap.dll"
-        SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols -L ../../.. yap.dll"
-        SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols -L ../..  -L ../../packages/PLStream yap.dll plstream.dll"
+        SHLIB_LOWER_LD="\$(CC) -shared -Wl,--export-all-symbols ../../../yap.dll"
+        SHLIB_LOWER_CXX_LD="\$(CXX) -shared -Wl,--export-all-symbols ../../../yap.dll"
+        SHLIB_SWI_LD="\$(CC) -shared -Wl,--export-all-symbols ../../yap.dll  ../../packages/PLStream/plstream.dll"
 	SHLIB_SUFFIX=".dll"
 	C_PARSER_FLAGS="$C_INTERF_FLAGS"
 	EXEC_SUFFIX=".exe"