--- config-compiler.h	Mon Jan 19 04:14:16 1970
+++ config-compiler.h	Mon Jan 19 04:14:16 1970
@@ -107,6 +107,8 @@
 
 #define OS_TYPE "Windows-MSVC"
 
+#undef socklen_t                /* avoid clash with <ws2tcpip.h> */
+
 #define LL(n) n##I64
 
 #define stat_alias _stati64
--- Makefile.src	Mon Jan 19 04:14:16 1970
+++ Makefile.src	Mon Jan 19 04:14:16 1970
@@ -41,15 +41,15 @@
 LD	= link
 RM	= -del
 
-DEFS	= /DWINDOWS /D_CONSOLE /DHAVE_CONFIG_H $(SSLDEFS)
-LIBS	= kernel32.lib advapi32.lib wsock32.lib user32.lib gdi32.lib $(SSLLIBS)
+DEFS	= /DWINDOWS /DENABLE_IPV6 /D_CONSOLE /DHAVE_CONFIG_H $(SSLDEFS)
+LIBS	= kernel32.lib advapi32.lib wsock32.lib user32.lib gdi32.lib ws2_32.lib $(SSLLIBS) msvcrt_winxp.obj msvcrt.lib
 
 !ifdef DEBUG
 CFLAGS	= /nologo /MTd /Od /Zi /I. $(DEFS)
 LDFLAGS	= /debug
 !else
-CFLAGS	= /nologo /MT /O2 /I. $(DEFS)
-LDFLAGS	= /opt:ref #/opt:nowin98
+CFLAGS	= /MD /nologo /O2 /Ox /I. -IC:\WinDDK\6001.18002\inc\api /IC:\WinDDK\6001.18002\inc\crt -IC:\Users\Cataphract\Desktop\openssl\include $(DEFS)
+LDFLAGS	= /subsystem:console /opt:ref /nodefaultlib:libcmt /nodefaultlib:libcmtd /nodefaultlib:msvcrt /nodefaultlib:msvcrt90 /LIBPATH:C:\WinDDK\6001.18002\lib\crt\i386 /LIBPATH:C:\WinDDK\6001.18002\lib\wxp\i386 /LIBPATH:C:\Users\Cataphract\Desktop\openssl\lib /PDB:wget.pdb
 !endif