diff --git a/Misc/NEWS b/Misc/NEWS
index 148dfee..887977a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,12 @@
   the close_fds arg to subprocess.Popen is not supported).
 
 
+Build
+-----
+
+- Patch #1576954: Update VC6 build directory; remove redundant
+  files in VC7.
+
 
 What's New in Python 2.5 (final)
 ================================
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index ec2ec3e..e8a8834 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -44,7 +44,7 @@
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\modules\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@
 # PROP Target_Dir ""
 F90=df.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\modules\zlib" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -129,6 +129,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_functoolsmodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_heapqmodule.c
 # End Source File
 # Begin Source File
@@ -141,6 +145,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_lsprof.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_randommodule.c
 # End Source File
 # Begin Source File
@@ -149,10 +157,18 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_struct.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\PC\_subprocess.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_typesmodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_weakref.c
 # End Source File
 # Begin Source File
@@ -169,6 +185,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\adler32.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\arraymodule.c
 # End Source File
 # Begin Source File
@@ -245,6 +265,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\compress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\config.c
 # End Source File
 # Begin Source File
@@ -253,6 +277,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\crc32.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\cStringIO.c
 # End Source File
 # Begin Source File
@@ -261,6 +289,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\deflate.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\descrobject.c
 # End Source File
 # Begin Source File
@@ -289,7 +321,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Python\exceptions.c
+SOURCE=..\..\Objects\exceptions.c
 # End Source File
 # Begin Source File
 
@@ -313,10 +345,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_functoolsmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Python\future.c
 # End Source File
 # Begin Source File
@@ -391,6 +419,18 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlib\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlib\inftrees.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\intobject.c
 # End Source File
 # Begin Source File
@@ -427,7 +467,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\md5c.c
+SOURCE=..\..\Modules\md5.c
 # End Source File
 # Begin Source File
 
@@ -507,6 +547,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Python\pyarena.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Python\pyfpe.c
 # End Source File
 # Begin Source File
@@ -519,11 +563,11 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\python_nt.rc
+SOURCE="..\..\Python\Python-ast.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Python\Python-ast.c
+SOURCE=..\python_nt.rc
 # End Source File
 # Begin Source File
 
@@ -539,11 +583,11 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Objects\setobject.c
+SOURCE=..\..\Modules\rotatingtree.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\shamodule.c
+SOURCE=..\..\Objects\setobject.c
 # End Source File
 # Begin Source File
 
@@ -555,6 +599,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\shamodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\signalmodule.c
 # End Source File
 # Begin Source File
@@ -575,10 +623,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\structmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Objects\structseq.c
 # End Source File
 # Begin Source File
@@ -615,6 +659,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\zlib\trees.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\tupleobject.c
 # End Source File
 # Begin Source File
@@ -645,5 +693,13 @@
 
 SOURCE=..\..\Modules\zipimport.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlibmodule.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlib\zutil.c
+# End Source File
 # End Target
 # End Project
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index ef200c4..b03c8f3 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -725,18 +725,12 @@
 			RelativePath="..\Modules\sha512module.c">
 		</File>
 		<File
-			RelativePath="..\Modules\sha512module.c">
-		</File>
-		<File
 			RelativePath="..\Modules\shamodule.c">
 		</File>
 		<File
 			RelativePath="..\Modules\signalmodule.c">
 		</File>
 		<File
-			RelativePath="..\Modules\signalmodule.c">
-		</File>
-		<File
 			RelativePath="..\Objects\sliceobject.c">
 		</File>
 		<File