Index: _bsddb/_bsddb.vcproj
===================================================================
--- _bsddb/_bsddb.vcproj	(revision 58978)
+++ _bsddb/_bsddb.vcproj	(working copy)
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
+				AdditionalDependencies="$(bsddbDir)\Debug\libdb46sd.lib ws2_32.lib advapi32.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -93,10 +93,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -112,16 +113,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="$(bsddbDir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -137,10 +134,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
+				AdditionalDependencies="$(bsddbDir)\Release\libdb46s.lib ws2_32.lib advapi32.lib"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -168,9 +168,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="PGUpdate|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -209,7 +209,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+				AdditionalDependencies="$(bsddbDir)\Release\libdb46s.lib ws2_32.lib advapi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -243,9 +243,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="PGInstrument|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -263,7 +263,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -285,13 +284,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
+				AdditionalDependencies="$(bsddbDir)\Release\libdb46s.lib ws2_32.lib advapi32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -319,11 +318,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGUpdate|Win32"
+			Name="Debug|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+			InheritedPropertySheets="..\pyd_d.vsprops"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -339,12 +337,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="$(bsddbDir)"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_BSDDB_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -360,13 +362,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
-				LinkIncremental="1"
+				AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -394,9 +393,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGUpdate|x64"
+			Name="Release|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -470,9 +469,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGInstrument|Win32"
+			Name="PGUpdate|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -490,6 +489,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -517,7 +517,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
Index: _tkinter/_tkinter.vcproj
===================================================================
--- _tkinter/_tkinter.vcproj	(revision 58978)
+++ _tkinter/_tkinter.vcproj	(working copy)
@@ -42,7 +42,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+				AdditionalIncludeDirectories="$(tcltkDir)/include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -61,6 +62,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tk84.lib tcl84.lib odbccp32.lib"
+				AdditionalLibraryDirectories="$(tcltkDir)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -91,10 +94,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -110,15 +114,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				AdditionalIncludeDirectories="$(tcltkDir)\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -134,9 +135,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tk84.lib tcl84.lib odbccp32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(tcltkDir)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -164,9 +170,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="PGInstrument|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -187,6 +193,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="$(tcltkDir)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -204,7 +211,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tk84.lib tcl84.lib odbccp32.lib"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(tcltkDir)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -237,9 +246,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="PGUpdate|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -257,11 +266,11 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+				AdditionalIncludeDirectories="$(tcltkDir)/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS;WITH_APPINIT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -278,12 +287,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tk84.lib tcl84.lib odbccp32.lib"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(tcltkDir)\lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -311,11 +322,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGInstrument|Win32"
+			Name="Debug|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd_d.vsprops"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -331,11 +341,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
-				RuntimeLibrary="2"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_TKINTER_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -351,12 +365,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -384,9 +395,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGInstrument|x64"
+			Name="Release|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -458,9 +469,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGUpdate|Win32"
+			Name="PGInstrument|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -478,6 +489,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -503,7 +515,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
Index: bz2/bz2.vcproj
===================================================================
--- bz2/bz2.vcproj	(revision 58978)
+++ bz2/bz2.vcproj	(working copy)
@@ -59,10 +59,11 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"
+				AdditionalDependencies="$(bz2Dir)\libbz2.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -93,10 +94,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -112,16 +114,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="$(bz2Dir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -134,13 +132,17 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"
+				AdditionalDependencies="$(bz2Dir)\libbz2.lib"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -168,9 +170,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="PGInstrument|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -206,10 +208,11 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"
+				AdditionalDependencies="$(bz2Dir)\libbz2.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -243,9 +246,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="PGUpdate|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -263,7 +266,6 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -282,16 +284,17 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
+				CommandLine="cd $(bz2Dir)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"
+				AdditionalDependencies="$(bz2Dir)\libbz2.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -319,11 +322,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGInstrument|Win32"
+			Name="Debug|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd_d.vsprops"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -339,12 +341,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="$(bz2Dir)"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ2_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -360,13 +366,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(bz2Dir)/Release/libbz2.lib"
-				LinkIncremental="1"
+				AdditionalDependencies="$(bz2Dir)/Debug/libbz2.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -394,9 +397,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGInstrument|x64"
+			Name="Release|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -470,9 +473,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="PGUpdate|Win32"
+			Name="PGInstrument|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -490,6 +493,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -517,7 +521,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
Index: make_buildinfo/make_buildinfo.vcproj
===================================================================
--- make_buildinfo/make_buildinfo.vcproj	(revision 58978)
+++ make_buildinfo/make_buildinfo.vcproj	(working copy)
@@ -98,6 +98,14 @@
 			RelativePath=".\make_buildinfo.c"
 			>
 		</File>
+		<File
+			RelativePath=".\make_buildinfo.rc"
+			>
+		</File>
+		<File
+			RelativePath=".\resource.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
Index: make_versioninfo/make_versioninfo.vcproj
===================================================================
--- make_versioninfo/make_versioninfo.vcproj	(revision 58978)
+++ make_versioninfo/make_versioninfo.vcproj	(working copy)
@@ -101,6 +101,14 @@
 			RelativePath="..\..\PC\make_versioninfo.c"
 			>
 		</File>
+		<File
+			RelativePath=".\make_versioninfo.rc"
+			>
+		</File>
+		<File
+			RelativePath=".\resource.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
Index: pcbuild.sln
===================================================================
--- pcbuild.sln	(revision 58978)
+++ pcbuild.sln	(working copy)
@@ -107,6 +107,10 @@
 		PGUpdate|x64 = PGUpdate|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		ReleaseAMD64|Win32 = ReleaseAMD64|Win32
+		ReleaseAMD64|x64 = ReleaseAMD64|x64
+		ReleaseItanium|Win32 = ReleaseItanium|Win32
+		ReleaseItanium|x64 = ReleaseItanium|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -125,6 +129,12 @@
 		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|Win32.Build.0 = Release|Win32
 		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|x64.ActiveCfg = Release|x64
 		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.Release|x64.Build.0 = Release|x64
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28}.ReleaseItanium|x64.Build.0 = Release|x64
 		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|Win32.Build.0 = Debug|Win32
 		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Debug|x64.ActiveCfg = Debug|Win32
@@ -138,6 +148,12 @@
 		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|Win32.ActiveCfg = Debug|Win32
 		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|Win32.Build.0 = Debug|Win32
 		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.Release|x64.ActiveCfg = Debug|Win32
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.ReleaseAMD64|Win32.ActiveCfg = Debug|Win32
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.ReleaseAMD64|Win32.Build.0 = Debug|Win32
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.ReleaseAMD64|x64.ActiveCfg = Debug|Win32
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.ReleaseItanium|Win32.ActiveCfg = Debug|Win32
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.ReleaseItanium|Win32.Build.0 = Debug|Win32
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}.ReleaseItanium|x64.ActiveCfg = Debug|Win32
 		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|Win32.Build.0 = Debug|Win32
 		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Debug|x64.ActiveCfg = Debug|Win32
@@ -151,6 +167,12 @@
 		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|Win32.ActiveCfg = Debug|Win32
 		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|Win32.Build.0 = Debug|Win32
 		{87AB87DB-B665-4621-A67B-878C15B93FF0}.Release|x64.ActiveCfg = Debug|Win32
+		{87AB87DB-B665-4621-A67B-878C15B93FF0}.ReleaseAMD64|Win32.ActiveCfg = Debug|Win32
+		{87AB87DB-B665-4621-A67B-878C15B93FF0}.ReleaseAMD64|Win32.Build.0 = Debug|Win32
+		{87AB87DB-B665-4621-A67B-878C15B93FF0}.ReleaseAMD64|x64.ActiveCfg = Debug|Win32
+		{87AB87DB-B665-4621-A67B-878C15B93FF0}.ReleaseItanium|Win32.ActiveCfg = Debug|Win32
+		{87AB87DB-B665-4621-A67B-878C15B93FF0}.ReleaseItanium|Win32.Build.0 = Debug|Win32
+		{87AB87DB-B665-4621-A67B-878C15B93FF0}.ReleaseItanium|x64.ActiveCfg = Debug|Win32
 		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|Win32.Build.0 = Debug|Win32
 		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Debug|x64.ActiveCfg = Debug|x64
@@ -167,6 +189,12 @@
 		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|Win32.Build.0 = Release|Win32
 		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|x64.ActiveCfg = Release|x64
 		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.Release|x64.Build.0 = Release|x64
+		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{8D80F68B-F6EC-4E69-9B04-73F632A8A8ED}.ReleaseItanium|x64.Build.0 = Release|x64
 		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|Win32.Build.0 = Debug|Win32
 		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Debug|x64.ActiveCfg = Debug|x64
@@ -183,6 +211,12 @@
 		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|Win32.Build.0 = Release|Win32
 		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|x64.ActiveCfg = Release|x64
 		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.Release|x64.Build.0 = Release|x64
+		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{F548A318-960A-4B37-9CD6-86B1B0E33CC8}.ReleaseItanium|x64.Build.0 = Release|x64
 		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|Win32.Build.0 = Debug|Win32
 		{CB025148-F0A1-4B32-A669-19EE0534136D}.Debug|x64.ActiveCfg = Debug|x64
@@ -199,6 +233,12 @@
 		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|Win32.Build.0 = Release|Win32
 		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|x64.ActiveCfg = Release|x64
 		{CB025148-F0A1-4B32-A669-19EE0534136D}.Release|x64.Build.0 = Release|x64
+		{CB025148-F0A1-4B32-A669-19EE0534136D}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{CB025148-F0A1-4B32-A669-19EE0534136D}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{CB025148-F0A1-4B32-A669-19EE0534136D}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{CB025148-F0A1-4B32-A669-19EE0534136D}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{CB025148-F0A1-4B32-A669-19EE0534136D}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{CB025148-F0A1-4B32-A669-19EE0534136D}.ReleaseItanium|x64.Build.0 = Release|x64
 		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|Win32.Build.0 = Debug|Win32
 		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Debug|x64.ActiveCfg = Debug|x64
@@ -215,6 +255,12 @@
 		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|Win32.Build.0 = Release|Win32
 		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|x64.ActiveCfg = Release|x64
 		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.Release|x64.Build.0 = Release|x64
+		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{A25ADCC5-8DE1-4F88-B842-C287923280B1}.ReleaseItanium|x64.Build.0 = Release|x64
 		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|Win32.Build.0 = Debug|Win32
 		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Debug|x64.ActiveCfg = Debug|x64
@@ -231,6 +277,12 @@
 		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|Win32.Build.0 = Release|Win32
 		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|x64.ActiveCfg = Release|x64
 		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.Release|x64.Build.0 = Release|x64
+		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{D50E5319-41CC-429A-8E81-B1CD391C3A7B}.ReleaseItanium|x64.Build.0 = Release|x64
 		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|Win32.Build.0 = Debug|Win32
 		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Debug|x64.ActiveCfg = Debug|x64
@@ -247,6 +299,12 @@
 		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|Win32.Build.0 = Release|Win32
 		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|x64.ActiveCfg = Release|x64
 		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.Release|x64.Build.0 = Release|x64
+		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{AE617428-B823-4B87-BC6D-DC7C12C746D3}.ReleaseItanium|x64.Build.0 = Release|x64
 		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|Win32.ActiveCfg = Debug|Win32
 		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|Win32.Build.0 = Debug|Win32
 		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Debug|x64.ActiveCfg = Debug|x64
@@ -263,6 +321,12 @@
 		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|Win32.Build.0 = Release|Win32
 		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|x64.ActiveCfg = Release|x64
 		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.Release|x64.Build.0 = Release|x64
+		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{98C3DB47-DD1F-4A4B-9D3C-1DBB32AC6667}.ReleaseItanium|x64.Build.0 = Release|x64
 		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|Win32.Build.0 = Debug|Win32
 		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Debug|x64.ActiveCfg = Debug|x64
@@ -279,6 +343,12 @@
 		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|Win32.Build.0 = Release|Win32
 		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|x64.ActiveCfg = Release|x64
 		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.Release|x64.Build.0 = Release|x64
+		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{0BAFC4A4-8DB5-4CC6-9DDB-A1D32C682B2F}.ReleaseItanium|x64.Build.0 = Release|x64
 		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|Win32.Build.0 = Debug|Win32
 		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Debug|x64.ActiveCfg = Debug|x64
@@ -295,6 +365,12 @@
 		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|Win32.Build.0 = Release|Win32
 		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|x64.ActiveCfg = Release|x64
 		{D04B2089-7DA9-4D92-B23F-07453BC46652}.Release|x64.Build.0 = Release|x64
+		{D04B2089-7DA9-4D92-B23F-07453BC46652}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{D04B2089-7DA9-4D92-B23F-07453BC46652}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{D04B2089-7DA9-4D92-B23F-07453BC46652}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{D04B2089-7DA9-4D92-B23F-07453BC46652}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{D04B2089-7DA9-4D92-B23F-07453BC46652}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{D04B2089-7DA9-4D92-B23F-07453BC46652}.ReleaseItanium|x64.Build.0 = Release|x64
 		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|Win32.Build.0 = Debug|Win32
 		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Debug|x64.ActiveCfg = Debug|x64
@@ -311,6 +387,12 @@
 		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|Win32.Build.0 = Release|Win32
 		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|x64.ActiveCfg = Release|x64
 		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.Release|x64.Build.0 = Release|x64
+		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{1015E3B4-FD3B-4402-AA6E-7806514156D6}.ReleaseItanium|x64.Build.0 = Release|x64
 		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|Win32.Build.0 = Debug|Win32
 		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Debug|x64.ActiveCfg = Debug|x64
@@ -327,6 +409,12 @@
 		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|Win32.Build.0 = Release|Win32
 		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|x64.ActiveCfg = Release|x64
 		{AE31A248-5367-4EB2-A511-8722BC351CB4}.Release|x64.Build.0 = Release|x64
+		{AE31A248-5367-4EB2-A511-8722BC351CB4}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{AE31A248-5367-4EB2-A511-8722BC351CB4}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{AE31A248-5367-4EB2-A511-8722BC351CB4}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{AE31A248-5367-4EB2-A511-8722BC351CB4}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{AE31A248-5367-4EB2-A511-8722BC351CB4}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{AE31A248-5367-4EB2-A511-8722BC351CB4}.ReleaseItanium|x64.Build.0 = Release|x64
 		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|Win32.Build.0 = Debug|Win32
 		{E644B843-F7CA-4888-AA6D-653C77592856}.Debug|x64.ActiveCfg = Debug|x64
@@ -343,6 +431,12 @@
 		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|Win32.Build.0 = PGInstrument|Win32
 		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.ActiveCfg = Release|x64
 		{E644B843-F7CA-4888-AA6D-653C77592856}.Release|x64.Build.0 = Release|x64
+		{E644B843-F7CA-4888-AA6D-653C77592856}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{E644B843-F7CA-4888-AA6D-653C77592856}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{E644B843-F7CA-4888-AA6D-653C77592856}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{E644B843-F7CA-4888-AA6D-653C77592856}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{E644B843-F7CA-4888-AA6D-653C77592856}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{E644B843-F7CA-4888-AA6D-653C77592856}.ReleaseItanium|x64.Build.0 = Release|x64
 		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|Win32.Build.0 = Debug|Win32
 		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Debug|x64.ActiveCfg = Debug|x64
@@ -359,6 +453,12 @@
 		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|Win32.Build.0 = Release|Win32
 		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|x64.ActiveCfg = Release|x64
 		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.Release|x64.Build.0 = Release|x64
+		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{1E8DCFC4-1EF8-4076-8CA2-B08D3C979749}.ReleaseItanium|x64.Build.0 = Release|x64
 		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|Win32.Build.0 = Debug|Win32
 		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Debug|x64.ActiveCfg = Debug|x64
@@ -375,6 +475,12 @@
 		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|Win32.Build.0 = Release|Win32
 		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|x64.ActiveCfg = Release|x64
 		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.Release|x64.Build.0 = Release|x64
+		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{3A1515AF-3694-4222-91F2-9837BDF60F9A}.ReleaseItanium|x64.Build.0 = Release|x64
 		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|Win32.Build.0 = Debug|Win32
 		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Debug|x64.ActiveCfg = Debug|x64
@@ -391,6 +497,12 @@
 		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|Win32.Build.0 = Release|Win32
 		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|x64.ActiveCfg = Release|x64
 		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.Release|x64.Build.0 = Release|x64
+		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{18C518FB-33CB-4C16-AA05-8DEA8DE66DF0}.ReleaseItanium|x64.Build.0 = Release|x64
 		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|Win32.ActiveCfg = Debug|Win32
 		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|Win32.Build.0 = Debug|Win32
 		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Debug|x64.ActiveCfg = Debug|x64
@@ -407,6 +519,12 @@
 		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|Win32.Build.0 = Release|Win32
 		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|x64.ActiveCfg = Release|x64
 		{80EBF51A-6018-4589-9A53-5AAF2872E230}.Release|x64.Build.0 = Release|x64
+		{80EBF51A-6018-4589-9A53-5AAF2872E230}.ReleaseAMD64|Win32.ActiveCfg = Release|x64
+		{80EBF51A-6018-4589-9A53-5AAF2872E230}.ReleaseAMD64|x64.ActiveCfg = Release|x64
+		{80EBF51A-6018-4589-9A53-5AAF2872E230}.ReleaseAMD64|x64.Build.0 = Release|x64
+		{80EBF51A-6018-4589-9A53-5AAF2872E230}.ReleaseItanium|Win32.ActiveCfg = Release|x64
+		{80EBF51A-6018-4589-9A53-5AAF2872E230}.ReleaseItanium|x64.ActiveCfg = Release|x64
+		{80EBF51A-6018-4589-9A53-5AAF2872E230}.ReleaseItanium|x64.Build.0 = Release|x64
 		{128AA855-8778-4F08-B001-FF79DC95F480}.Debug|Win32.ActiveCfg = Debug|Win32
 		{128AA855-8778-4F08-B001-FF79DC95F480}.Debug|Win32.Build.0 = Debug|Win32
 		{128AA855-8778-4F08-B001-FF79DC95F480}.Debug|x64.ActiveCfg = Debug|Win32
@@ -419,6 +537,12 @@
 		{128AA855-8778-4F08-B001-FF79DC95F480}.Release|Win32.ActiveCfg = Release|Win32
 		{128AA855-8778-4F08-B001-FF79DC95F480}.Release|Win32.Build.0 = Release|Win32
 		{128AA855-8778-4F08-B001-FF79DC95F480}.Release|x64.ActiveCfg = Release|Win32
+		{128AA855-8778-4F08-B001-FF79DC95F480}.ReleaseAMD64|Win32.ActiveCfg = Release|Win32
+		{128AA855-8778-4F08-B001-FF79DC95F480}.ReleaseAMD64|Win32.Build.0 = Release|Win32
+		{128AA855-8778-4F08-B001-FF79DC95F480}.ReleaseAMD64|x64.ActiveCfg = Release|Win32
+		{128AA855-8778-4F08-B001-FF79DC95F480}.ReleaseItanium|Win32.ActiveCfg = Release|Win32
+		{128AA855-8778-4F08-B001-FF79DC95F480}.ReleaseItanium|Win32.Build.0 = Release|Win32
+		{128AA855-8778-4F08-B001-FF79DC95F480}.ReleaseItanium|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Index: pyproject.vsprops
===================================================================
--- pyproject.vsprops	(revision 58978)
+++ pyproject.vsprops	(working copy)
@@ -25,14 +25,18 @@
 	/>
 	<UserMacro
 		Name="bsddbDir"
-		Value="..\..\..\db-4.4.20\build_win32"
+		Value="..\..\..\db-4.6.21\build_windows"
 	/>
 	<UserMacro
 		Name="sqlite3Dir"
-		Value="..\..\..\sqlite-source-3.3.4"
+		Value="..\..\..\sqlite-3.5.2"
 	/>
 	<UserMacro
 		Name="bz2Dir"
-		Value="..\..\..\bzip2-1.0.3"
+		Value="..\..\..\bzip2-1.0.4"
 	/>
+	<UserMacro
+		Name="tcltkDir"
+		Value="..\..\..\tcltk"
+	/>
 </VisualStudioPropertySheet>
Index: readme.txt
===================================================================
--- readme.txt	(revision 58978)
+++ readme.txt	(working copy)
@@ -106,21 +106,21 @@
 
 _tkinter
     Python wrapper for the Tk windowing system.  Requires building
-    Tcl/Tk first.  Following are instructions for Tcl/Tk 8.4.12.
+    Tcl/Tk first.  Following are instructions for Tcl/Tk 8.4.16.
 
     Get source
     ----------
     In the dist directory, run
-    svn export http://svn.python.org/projects/external/tcl8.4.12
-    svn export http://svn.python.org/projects/external/tk8.4.12
+    svn export http://svn.python.org/projects/external/tcl8.4.16
+    svn export http://svn.python.org/projects/external/tk8.4.16
     svn export http://svn.python.org/projects/external/tix-8.4.0
 
     Build Tcl first (done here w/ MSVC 7.1 on Windows XP)
     ---------------
-    Use "Start -> All Programs -> Microsoft Visual Studio .NET 2003
-         -> Visual Studio .NET Tools -> Visual Studio .NET 2003 Command Prompt"
+    Use "Start -> All Programs -> Microsoft Visual Studio 2005
+         -> Visual Studio Tools -> Visual Studio 2005 Command Prompt"
     to get a shell window with the correct environment settings
-    cd dist\tcl8.4.12\win
+    cd dist\tcl8.4.16\win
     nmake -f makefile.vc
     nmake -f makefile.vc INSTALLDIR=..\..\tcltk install
 
@@ -135,9 +135,9 @@
 
     Build Tk
     --------
-    cd dist\tk8.4.12\win
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12
-    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 INSTALLDIR=..\..\tcltk install
+    cd dist\tk8.4.16\win
+    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.16
+    nmake -f makefile.vc TCLDIR=..\..\tcl8.4.16 INSTALLDIR=..\..\tcltk install
 
     XXX Should we compile with OPTS=threads?
 
@@ -145,7 +145,7 @@
     XXX directory.  Is all of that really needed for Python use of Tcl/Tk?
 
     Optional:  run tests, via
-        nmake -f makefile.vc TCLDIR=..\..\tcl8.4.12 test
+        nmake -f makefile.vc TCLDIR=..\..\tcl8.4.16 test
 
         On WinXP Pro, wholly up to date as of 30-Aug-2004:
         all.tcl:        Total   8420    Passed  6826    Skipped 1581    Failed  13
@@ -155,6 +155,7 @@
    Built Tix
    ---------
    cd dist\tix-8.4.0\win
+   set MSVCDIR=%VCINSTALLDIR%
    nmake -f python.mak
    nmake -f python.mak install
 
@@ -185,38 +186,37 @@
     To use the version of bsddb that Python is built with by default, invoke
     (in the dist directory)
 
-     svn export http://svn.python.org/projects/external/db-4.4.20
+     svn export http://svn.python.org/projects/external/db-4.6.21
 
+    Convert db-4.6.21\build_windows\Berkeley_DB.dsw to db-4.6.21\build_windows\Berkeley_DB.sln in VS 2005, then open a VS 2005 shell, and invoke:
 
-    Then open a VS.NET 2003 shell, and invoke:
+       devenv db-4.6.21\build_windows\Berkeley_DB.sln /build "Release x86" /project db_static
 
-       devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
-
     and do that a second time for a Debug build too:
 
-       devenv db-4.4.20\build_win32\Berkeley_DB.sln /build Debug /project db_static
+       devenv db-4.6.21\build_windows\Berkeley_DB.sln /build "Debug x86" /project db_static
 
     Alternatively, if you want to start with the original sources,
     go to Sleepycat's download page:
         http://www.sleepycat.com/downloads/releasehistorybdb.html
 
-    and download version 4.4.20.
+    and download version 4.6.21.
 
     With or without strong cryptography? You can choose either with or
     without strong cryptography, as per the instructions below.  By
     default, Python is built and distributed WITHOUT strong crypto.
 
     Unpack the sources; if you downloaded the non-crypto version, rename
-    the directory from db-4.4.20.NC to db-4.4.20.
+    the directory from db-4.6.21.NC to db-4.6.21.
 
     Now apply any patches that apply to your version.
 
     Open
-        dist\db-4.4.20\docs\index.html
+        dist\db-4.6.21\docs\index.html
 
-    and follow the "Windows->Building Berkeley DB with Visual C++ .NET"
+    and follow the "Windows->Building Berkeley DB with Visual C++ 2005"
     instructions for building the Sleepycat
-    software.  Note that Berkeley_DB.dsw is in the build_win32 subdirectory.
+    software.  Note that Berkeley_DB.dsw is in the build_windows subdirectory.
     Build the "db_static" project, for "Release" mode.
 
     To run extensive tests, pass "-u bsddb" to regrtest.py.  test_bsddb3.py
@@ -249,12 +249,12 @@
     XXX threads are invisible to unittest).
 
     Building for Win64:
-    - open a VS.NET 2003 command prompt
+    - open a VS 2005 command prompt
     - run the SDK setenv.cmd script, passing /RETAIL and the target
       architecture (/SRV64 for Itanium, /X64 for AMD64)
     - build BerkeleyDB with the solution configuration matching the
       target ("Release IA64" for Itanium, "Release AMD64" for AMD64), e.g.
-    devenv db-4.4.20\build_win32\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
+    devenv db-4.6.21\build_windows\Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
 
 _sqlite3
     Python wrapper for SQLite library.
@@ -281,7 +281,7 @@
         http://www.activestate.com/Products/ActivePerl/
     as this is used by the OpenSSL build process.  Complain to them <wink>.
 
-    The MSVC project simply invokes PCBuild/build_ssl.py to perform
+    The MSVC project simply invokes PCBuild8/build_ssl.py to perform
     the build.  This Python script locates and builds your OpenSSL
     installation, then invokes a simple makefile to build the final .pyd.