Index: win/makefile.vc
===================================================================
--- win/makefile.vc	(revision 89010)
+++ win/makefile.vc	(working copy)
@@ -46,10 +46,10 @@
 TCL_MAJOR	= 8
 !ENDIF
 !IFNDEF TCL_MINOR
-TCL_MINOR	= 5
+TCL_MINOR	= 6
 !ENDIF
 !IFNDEF TCL_PATCH
-TCL_PATCH	= 11
+TCL_PATCH	= 1
 !ENDIF
 
 TK_MAJOR	= $(TCL_MAJOR)
@@ -133,7 +133,7 @@
 !IF "$(NODEBUG)" == "1"
 ldebug 		= /RELEASE
 !ELSE
-ldebug 		= -debug:full -debugtype:cv
+ldebug 		= -debug -debugtype:cv
 !ENDIF
 
 # declarations common to all linker options
@@ -158,13 +158,13 @@
 # makefile.vc in Tk claims -O2 is buggy and so uses -Ot, so we do the same)
 
 !IF "$(NODEBUG)" == "1"
-optflags 	= -Oti -Gs -GD
+optflags 	= -Oti -Gs
 !ELSE
 optflags 	= -Od -Zi
 !ENDIF
 
 cvarsdll  	= -DWIN32 -D_WIN32 -D_MT -D_DLL -DSTDC_HEADERS
-cflagsdll 	= $(cvarsdll) -c -W3 -nologo -Fp$(TMPDIR)\ -YX -MD \
+cflagsdll 	= $(cvarsdll) -c -W3 -nologo -Fp$(TMPDIR)\ -MD \
 	          $(optflags)
 
 ######################################################################
@@ -216,7 +216,7 @@
 !IF "$(NODEBUG)" == "1"
 DBGX    	=
 !ELSE
-DBGX 		= d
+DBGX 		= g
 !ENDIF
 
 TMPDIR 		= $(BUILDDIRTOP)
Index: win/python.mak
===================================================================
--- win/python.mak	(revision 89010)
+++ win/python.mak	(working copy)
@@ -2,8 +2,14 @@
 
 TOOLS32 = $(VCINSTALLDIR)
 
+!if $(DEBUG)
+BUILDDIRTOP = Debug
+NODEBUG = 0
+TCL_DBGX = g
+!else
 BUILDDIRTOP = Release
 NODEBUG = 1
+!endif
 
 VCVER=0
 !if ![echo VCVERSION=_MSC_VER > vercl.x] \