Index: Modules/errnomodule.c
===================================================================
--- Modules/errnomodule.c	(revision 58625)
+++ Modules/errnomodule.c	(working copy)
@@ -5,6 +5,7 @@
 
 /* Windows socket errors (WSA*)  */
 #ifdef MS_WINDOWS
+#define WIN32_LEAN_AND_MEAN
 #include <winsock.h>
 #endif
 
Index: Modules/selectmodule.c
===================================================================
--- Modules/selectmodule.c	(revision 58625)
+++ Modules/selectmodule.c	(working copy)
@@ -46,6 +46,7 @@
 #endif
 
 #ifdef MS_WINDOWS
+#  define WIN32_LEAN_AND_MEAN
 #  include <winsock.h>
 #else
 #  define SOCKET int
Index: Modules/socketmodule.h
===================================================================
--- Modules/socketmodule.h	(revision 58625)
+++ Modules/socketmodule.h	(working copy)
@@ -22,6 +22,7 @@
 # define HAVE_GETNAMEINFO
 # define ENABLE_IPV6
 #else
+# define WIN32_LEAN_AND_MEAN
 # include <winsock.h>
 #endif
 #endif
Index: PC/VC6/python.dsp
===================================================================
--- PC/VC6/python.dsp	(revision 58625)
+++ PC/VC6/python.dsp	(working copy)
@@ -77,6 +77,11 @@
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Desc=Changing stack size...
+PostBuild_Cmds=editbin /STACK:0x200000 python_d.exe
+# End Special Build Tool
 
 !ENDIF 
 
Index: PC/VC6/pythoncore.dsp
===================================================================
--- PC/VC6/pythoncore.dsp	(revision 58625)
+++ PC/VC6/pythoncore.dsp	(working copy)
@@ -253,7 +253,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\collectionsmodule.c
+SOURCE=..\..\Modules\_collectionsmodule.c
 # End Source File
 # Begin Source File
 
@@ -329,6 +329,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Parser\firstsets.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\floatobject.c
 # End Source File
 # Begin Source File
@@ -398,10 +402,18 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Parser\grammar.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Parser\grammar1.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\gzio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\imageop.c
 # End Source File
 # Begin Source File
@@ -419,6 +431,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\infback.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\zlib\inffast.c
 # End Source File
 # Begin Source File
@@ -583,10 +599,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\rgbimgmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\rotatingtree.c
 # End Source File
 # Begin Source File
@@ -675,6 +687,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\unicodectype.c
 # End Source File
 # Begin Source File
Index: PC/VC6/readme.txt
===================================================================
--- PC/VC6/readme.txt	(revision 58625)
+++ PC/VC6/readme.txt	(working copy)
@@ -203,8 +203,6 @@
     the build.  This Python script locates and builds your OpenSSL
     installation, then invokes a simple makefile to build the final .pyd.
 
-    Win9x users:  see "Win9x note" below.
-
     build_ssl.py attempts to catch the most common errors (such as not
     being able to find OpenSSL sources, or not being able to find a Perl
     that works with OpenSSL) and give a reasonable error message.
@@ -216,31 +214,7 @@
     build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do
     this by hand.
 
-    Win9x note:  If, near the start of the build process, you see
-    something like
 
-        C:\Code\openssl-0.9.6g>set OPTS=no-asm
-        Out of environment space
-
-    then you're in trouble, and will probably also see these errors near
-    the end of the process:
-
-        NMAKE : fatal error U1073: don't know how to make
-            'crypto\md5\asm\m5_win32.asm'
-        Stop.
-        NMAKE : fatal error U1073: don't know how to make
-            'C:\Code\openssl-0.9.6g/out32/libeay32.lib'
-        Stop.
-
-    You need more environment space.  Win9x only has room for 256 bytes
-    by default, and especially after installing ActivePerl (which fiddles
-    the PATH envar), you're likely to run out.  KB Q230205
-
-        http://support.microsoft.com/default.aspx?scid=KB;en-us;q230205
-
-    explains how to edit CONFIG.SYS to cure this.
-
-
 YOUR OWN EXTENSION DLLs
 -----------------------
 If you want to create your own extension module DLL, there's an example