diff --git a/SDLnet.c b/SDLnet.c
index a79974b..cb714a6 100644
--- a/SDLnet.c
+++ b/SDLnet.c
@@ -106,6 +106,9 @@ void SDLNet_Quit(void)
 		/* Clean up windows networking */
 		if ( WSACleanup() == SOCKET_ERROR ) {
 			if ( WSAGetLastError() == WSAEINPROGRESS ) {
+#ifndef __USE_WINSOCK2
+				WSACancelBlockingCall();
+#endif
 				WSACleanup();
 			}
 		}
diff --git a/SDLnetsys.h b/SDLnetsys.h
index 2494879..1f8886e 100644
--- a/SDLnetsys.h
+++ b/SDLnetsys.h
@@ -33,8 +33,15 @@
 /* Include system network headers */
 #if defined(__WIN32__) || defined(WIN32)
 #define __USE_W32_SOCKETS
+#ifdef __USE_WINSOCK2
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#else
+#include <winsock.h>
+/* NOTE: windows socklen_t is signed
+ * and is defined only for winsock2. */
+typedef int socklen_t;
+#endif
 #include <iphlpapi.h>
 #else /* UNIX */
 #ifdef __OS2__
diff --git a/VisualC/SDL_net_VS2008.vcproj b/VisualC/SDL_net_VS2008.vcproj
index ed858ed..aa1907a 100644
--- a/VisualC/SDL_net_VS2008.vcproj
+++ b/VisualC/SDL_net_VS2008.vcproj
@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__USE_WINSOCK2"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\Debug/SDL_net.pch"
@@ -138,7 +138,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__USE_WINSOCK2"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\Debug/SDL_net.pch"
@@ -229,7 +229,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__USE_WINSOCK2"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -316,7 +316,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__USE_WINSOCK2"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
diff --git a/configure.ac b/configure.ac
index 79a259c..ba3511b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,10 +82,19 @@ AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
 dnl Figure out which networking libraries to use
 case "$host" in
     *mingw32ce*)
+        CFLAGS="$CFLAGS -D__USE_WINSOCK2"
         INETLIB="-lws2 -liphlpapi"
         ;;
     *-*-cygwin* | *-*-mingw*)
-        INETLIB="-lws2_32 -liphlpapi"
+        AC_ARG_ENABLE(winsock2,
+        [AS_HELP_STRING([--enable-winsock2],[Build with Winsock 2 instead of 1.1 [default=yes]])],
+                      , enable_winsock2=yes)
+        if test x$enable_winsock2 = xyes; then
+            CFLAGS="$CFLAGS -D__USE_WINSOCK2"
+            INETLIB="-lws2_32 -liphlpapi"
+        else
+            INETLIB="-lwsock32 -liphlpapi"
+        fi
         ;;
     sparc*-*-solaris*)
         INETLIB="-lsocket -lnsl"