diff --git a/bin/check/win32/namedcheckconf.mak b/bin/check/win32/namedcheckconf.mak
index 7d1ac3771b..b430a880ba 100644
--- a/bin/check/win32/namedcheckconf.mak
+++ b/bin/check/win32/namedcheckconf.mak
@@ -209,24 +209,24 @@ SOURCE="..\named-checkconf.c"
 !IF  "$(CFG)" == "namedcheckconf - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\check\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\check\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
@@ -235,24 +235,24 @@ SOURCE="..\named-checkconf.c"
 !IF  "$(CFG)" == "namedcheckconf - Win32 Release"
 
 "libisccfg - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
    cd "..\..\..\bin\check\win32"
 
 "libisccfg - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
 
 "libisccfg - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
    cd "..\..\..\bin\check\win32"
 
 "libisccfg - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
@@ -261,24 +261,24 @@ SOURCE="..\named-checkconf.c"
 !IF  "$(CFG)" == "namedcheckconf - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\check\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ELSEIF  "$(CFG)" == "namedcheckconf - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\check\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
diff --git a/bin/check/win32/namedcheckzone.dsp b/bin/check/win32/namedcheckzone.dsp
index 5739ce2354..daec74a8e9 100644
--- a/bin/check/win32/namedcheckzone.dsp
+++ b/bin/check/win32/namedcheckzone.dsp
@@ -42,7 +42,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /c
+# SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
diff --git a/bin/check/win32/namedcheckzone.mak b/bin/check/win32/namedcheckzone.mak
index 290c8324ea..d532f74992 100644
--- a/bin/check/win32/namedcheckzone.mak
+++ b/bin/check/win32/namedcheckzone.mak
@@ -25,24 +25,18 @@ NULL=
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "namedcheckzone - Win32 Release"
 
 OUTDIR=.\Release
 INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
 
 !IF "$(RECURSE)" == "0" 
 
-ALL : "..\..\..\Build\Release\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"
+ALL : "..\..\..\Build\Release\named-checkzone.exe"
 
 !ELSE 
 
-ALL : "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named-checkzone.exe" "$(OUTDIR)\namedcheckzone.bsc"
+ALL : "libisc - Win32 Release" "libdns - Win32 Release" "..\..\..\Build\Release\named-checkzone.exe"
 
 !ENDIF 
 
@@ -52,28 +46,51 @@ CLEAN :"libdns - Win32 ReleaseCLEAN" "libisc - Win32 ReleaseCLEAN"
 CLEAN :
 !ENDIF 
 	-@erase "$(INTDIR)\check-tool.obj"
-	-@erase "$(INTDIR)\check-tool.sbr"
 	-@erase "$(INTDIR)\named-checkzone.obj"
-	-@erase "$(INTDIR)\named-checkzone.sbr"
 	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(OUTDIR)\namedcheckzone.bsc"
 	-@erase "..\..\..\Build\Release\named-checkzone.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\namedcheckzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP=cl.exe
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /Fp"$(INTDIR)\namedcheckzone.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
 BSC32_SBRS= \
-	"$(INTDIR)\check-tool.sbr" \
-	"$(INTDIR)\named-checkzone.sbr"
-
-"$(OUTDIR)\namedcheckzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
+	
 LINK32=link.exe
 LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\named-checkzone.pdb" /machine:I386 /out:"../../../Build/Release/named-checkzone.exe" 
 LINK32_OBJS= \
@@ -124,32 +141,8 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
+CPP=cl.exe
 CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
-BSC32_SBRS= \
-	"$(INTDIR)\check-tool.sbr" \
-	"$(INTDIR)\named-checkzone.sbr"
-
-"$(OUTDIR)\namedcheckzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept 
-LINK32_OBJS= \
-	"$(INTDIR)\check-tool.obj" \
-	"$(INTDIR)\named-checkzone.obj" \
-	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
-	"..\..\..\lib\isc\win32\Debug\libisc.lib"
-
-"..\..\..\Build\Debug\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -181,6 +174,33 @@ LINK32_OBJS= \
    $(CPP_PROJ) $< 
 <<
 
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\namedcheckzone.bsc" 
+BSC32_SBRS= \
+	"$(INTDIR)\check-tool.sbr" \
+	"$(INTDIR)\named-checkzone.sbr"
+
+"$(OUTDIR)\namedcheckzone.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\named-checkzone.pdb" /debug /machine:I386 /out:"../../../Build/Debug/named-checkzone.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\check-tool.obj" \
+	"$(INTDIR)\named-checkzone.obj" \
+	"..\..\..\lib\dns\win32\Debug\libdns.lib" \
+	"..\..\..\lib\isc\win32\Debug\libisc.lib"
+
+"..\..\..\Build\Debug\named-checkzone.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("namedcheckzone.dep")
@@ -194,37 +214,61 @@ LINK32_OBJS= \
 !IF "$(CFG)" == "namedcheckzone - Win32 Release" || "$(CFG)" == "namedcheckzone - Win32 Debug"
 SOURCE="..\check-tool.c"
 
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+
+"$(INTDIR)\check-tool.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+
 "$(INTDIR)\check-tool.obj"	"$(INTDIR)\check-tool.sbr" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 SOURCE="..\named-checkzone.c"
 
+!IF  "$(CFG)" == "namedcheckzone - Win32 Release"
+
+
+"$(INTDIR)\named-checkzone.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
+
+
 "$(INTDIR)\named-checkzone.obj"	"$(INTDIR)\named-checkzone.sbr" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 !IF  "$(CFG)" == "namedcheckzone - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\check\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\check\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
@@ -233,24 +277,24 @@ SOURCE="..\named-checkzone.c"
 !IF  "$(CFG)" == "namedcheckzone - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\check\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
 !ELSEIF  "$(CFG)" == "namedcheckzone - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\check\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\check\win32"
 
diff --git a/bin/dig/win32/dig.mak b/bin/dig/win32/dig.mak
index cf57efd1d8..d7d22d3122 100644
--- a/bin/dig/win32/dig.mak
+++ b/bin/dig/win32/dig.mak
@@ -222,24 +222,24 @@ SOURCE=..\dighost.c
 !IF  "$(CFG)" == "dig - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "dig - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -248,24 +248,24 @@ SOURCE=..\dighost.c
 !IF  "$(CFG)" == "dig - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "dig - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -274,24 +274,24 @@ SOURCE=..\dighost.c
 !IF  "$(CFG)" == "dig - Win32 Release"
 
 "libbind9 - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libbind9 - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "dig - Win32 Debug"
 
 "libbind9 - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libbind9 - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -300,24 +300,24 @@ SOURCE=..\dighost.c
 !IF  "$(CFG)" == "dig - Win32 Release"
 
 "liblwres - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "liblwres - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "dig - Win32 Debug"
 
 "liblwres - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "liblwres - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
diff --git a/bin/dig/win32/host.mak b/bin/dig/win32/host.mak
index a359e24288..7f3cc62aa1 100644
--- a/bin/dig/win32/host.mak
+++ b/bin/dig/win32/host.mak
@@ -222,24 +222,24 @@ SOURCE=..\host.c
 !IF  "$(CFG)" == "host - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "host - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -248,24 +248,24 @@ SOURCE=..\host.c
 !IF  "$(CFG)" == "host - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "host - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -274,24 +274,24 @@ SOURCE=..\host.c
 !IF  "$(CFG)" == "host - Win32 Release"
 
 "libbind9 - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libbind9 - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "host - Win32 Debug"
 
 "libbind9 - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libbind9 - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -300,24 +300,24 @@ SOURCE=..\host.c
 !IF  "$(CFG)" == "host - Win32 Release"
 
 "liblwres - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "liblwres - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "host - Win32 Debug"
 
 "liblwres - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "liblwres - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
diff --git a/bin/dig/win32/nslookup.mak b/bin/dig/win32/nslookup.mak
index 3cdcb5ac4d..00c69b6d40 100644
--- a/bin/dig/win32/nslookup.mak
+++ b/bin/dig/win32/nslookup.mak
@@ -222,24 +222,24 @@ SOURCE=..\nslookup.c
 !IF  "$(CFG)" == "nslookup - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -248,24 +248,24 @@ SOURCE=..\nslookup.c
 !IF  "$(CFG)" == "nslookup - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -274,24 +274,24 @@ SOURCE=..\nslookup.c
 !IF  "$(CFG)" == "nslookup - Win32 Release"
 
 "libbind9 - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "libbind9 - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
 
 "libbind9 - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "libbind9 - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
@@ -300,24 +300,24 @@ SOURCE=..\nslookup.c
 !IF  "$(CFG)" == "nslookup - Win32 Release"
 
 "liblwres - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
    cd "..\..\..\bin\dig\win32"
 
 "liblwres - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
 !ELSEIF  "$(CFG)" == "nslookup - Win32 Debug"
 
 "liblwres - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
    cd "..\..\..\bin\dig\win32"
 
 "liblwres - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\dig\win32"
 
diff --git a/bin/named/win32/named.mak b/bin/named/win32/named.mak
index bcfc9dc39a..9dab33f5ce 100644
--- a/bin/named/win32/named.mak
+++ b/bin/named/win32/named.mak
@@ -919,24 +919,24 @@ SOURCE=..\zoneconf.c
 !IF  "$(CFG)" == "named - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\named\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ELSEIF  "$(CFG)" == "named - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\named\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
@@ -945,24 +945,24 @@ SOURCE=..\zoneconf.c
 !IF  "$(CFG)" == "named - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\named\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ELSEIF  "$(CFG)" == "named - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\named\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
@@ -971,24 +971,24 @@ SOURCE=..\zoneconf.c
 !IF  "$(CFG)" == "named - Win32 Release"
 
 "libbind9 - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
    cd "..\..\..\bin\named\win32"
 
 "libbind9 - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ELSEIF  "$(CFG)" == "named - Win32 Debug"
 
 "libbind9 - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
    cd "..\..\..\bin\named\win32"
 
 "libbind9 - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
@@ -997,24 +997,24 @@ SOURCE=..\zoneconf.c
 !IF  "$(CFG)" == "named - Win32 Release"
 
 "liblwres - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" 
    cd "..\..\..\bin\named\win32"
 
 "liblwres - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ELSEIF  "$(CFG)" == "named - Win32 Debug"
 
 "liblwres - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" 
    cd "..\..\..\bin\named\win32"
 
 "liblwres - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\lwres\win32"
+   cd "..\..\..\lib\lwres\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\liblwres.mak" CFG="liblwres - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
@@ -1023,24 +1023,24 @@ SOURCE=..\zoneconf.c
 !IF  "$(CFG)" == "named - Win32 Release"
 
 "libisccc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 
    cd "..\..\..\bin\named\win32"
 
 "libisccc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ELSEIF  "$(CFG)" == "named - Win32 Debug"
 
 "libisccc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 
    cd "..\..\..\bin\named\win32"
 
 "libisccc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
@@ -1049,24 +1049,24 @@ SOURCE=..\zoneconf.c
 !IF  "$(CFG)" == "named - Win32 Release"
 
 "libisccfg - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
    cd "..\..\..\bin\named\win32"
 
 "libisccfg - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
 !ELSEIF  "$(CFG)" == "named - Win32 Debug"
 
 "libisccfg - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
    cd "..\..\..\bin\named\win32"
 
 "libisccfg - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\named\win32"
 
diff --git a/bin/nsupdate/win32/nsupdate.mak b/bin/nsupdate/win32/nsupdate.mak
index e6b220b0e1..80e39145d6 100644
--- a/bin/nsupdate/win32/nsupdate.mak
+++ b/bin/nsupdate/win32/nsupdate.mak
@@ -196,24 +196,24 @@ SOURCE=..\nsupdate.c
 !IF  "$(CFG)" == "nsupdate - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\..\bin\nsupdate\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
 !ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\..\bin\nsupdate\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\..\lib\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
@@ -222,24 +222,24 @@ SOURCE=..\nsupdate.c
 !IF  "$(CFG)" == "nsupdate - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\nsupdate\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
 !ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\nsupdate\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
@@ -248,24 +248,24 @@ SOURCE=..\nsupdate.c
 !IF  "$(CFG)" == "nsupdate - Win32 Release"
 
 "libbind9 - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
    cd "..\..\..\bin\nsupdate\win32"
 
 "libbind9 - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
 !ELSEIF  "$(CFG)" == "nsupdate - Win32 Debug"
 
 "libbind9 - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
    cd "..\..\..\bin\nsupdate\win32"
 
 "libbind9 - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\nsupdate\win32"
 
diff --git a/bin/rndc/win32/rndc.mak b/bin/rndc/win32/rndc.mak
index 3ce27c425f..c03697f6f6 100644
--- a/bin/rndc/win32/rndc.mak
+++ b/bin/rndc/win32/rndc.mak
@@ -222,24 +222,24 @@ SOURCE=..\util.c
 !IF  "$(CFG)" == "rndc - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\..\bin\rndc\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\..\bin\rndc\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\..\lib\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
@@ -248,24 +248,24 @@ SOURCE=..\util.c
 !IF  "$(CFG)" == "rndc - Win32 Release"
 
 "libisccc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" 
    cd "..\..\..\bin\rndc\win32"
 
 "libisccc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
 
 "libisccc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" 
    cd "..\..\..\bin\rndc\win32"
 
 "libisccc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccc\win32"
+   cd "..\..\..\lib\isccc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccc.mak" CFG="libisccc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
@@ -274,24 +274,24 @@ SOURCE=..\util.c
 !IF  "$(CFG)" == "rndc - Win32 Release"
 
 "libisccfg - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
    cd "..\..\..\bin\rndc\win32"
 
 "libisccfg - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
 
 "libisccfg - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
    cd "..\..\..\bin\rndc\win32"
 
 "libisccfg - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\..\lib\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
@@ -300,24 +300,24 @@ SOURCE=..\util.c
 !IF  "$(CFG)" == "rndc - Win32 Release"
 
 "libbind9 - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" 
    cd "..\..\..\bin\rndc\win32"
 
 "libbind9 - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
 !ELSEIF  "$(CFG)" == "rndc - Win32 Debug"
 
 "libbind9 - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" 
    cd "..\..\..\bin\rndc\win32"
 
 "libbind9 - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\bind9\win32"
+   cd "..\..\..\lib\bind9\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libbind9.mak" CFG="libbind9 - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\..\bin\rndc\win32"
 
diff --git a/lib/bind9/win32/libbind9.mak b/lib/bind9/win32/libbind9.mak
index 8cfbd71caf..49e5cdd940 100644
--- a/lib/bind9/win32/libbind9.mak
+++ b/lib/bind9/win32/libbind9.mak
@@ -275,24 +275,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libbind9 - Win32 Release"
 
 "libdns - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" 
    cd "..\..\bind9\win32"
 
 "libdns - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
 !ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
 
 "libdns - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" 
    cd "..\..\bind9\win32"
 
 "libdns - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\dns\win32"
+   cd "..\..\dns\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
@@ -301,24 +301,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libbind9 - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\bind9\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
 !ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\bind9\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
@@ -327,24 +327,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libbind9 - Win32 Release"
 
 "libisccfg - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" 
    cd "..\..\bind9\win32"
 
 "libisccfg - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
 !ELSEIF  "$(CFG)" == "libbind9 - Win32 Debug"
 
 "libisccfg - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" 
    cd "..\..\bind9\win32"
 
 "libisccfg - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isccfg\win32"
+   cd "..\..\isccfg\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisccfg.mak" CFG="libisccfg - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\bind9\win32"
 
diff --git a/lib/dns/win32/libdns.dsp b/lib/dns/win32/libdns.dsp
index 0b79f028ce..c65351fe42 100644
--- a/lib/dns/win32/libdns.dsp
+++ b/lib/dns/win32/libdns.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6b/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6b/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6g/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6g/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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 /dll /machine:I386
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6b/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6g/out32dll/libeay32.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll"
 
 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
 
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6b/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6g/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c
 # SUBTRACT CPP /X
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # 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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6b/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6g/out32dll/libeay32.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept
 
 !ENDIF 
 
diff --git a/lib/dns/win32/libdns.mak b/lib/dns/win32/libdns.mak
index fe62757408..4fdaab3e48 100644
--- a/lib/dns/win32/libdns.mak
+++ b/lib/dns/win32/libdns.mak
@@ -25,10 +25,6 @@ NULL=
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "libdns - Win32 Release"
 
 OUTDIR=.\Release
@@ -127,14 +123,48 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6b/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6b/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6g/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6g/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6b/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../../../openssl-0.9.6g/out32dll/libeay32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libdns.pdb" /machine:I386 /def:".\libdns.def" /out:"../../../Build/Release/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" 
 DEF_FILE= \
 	".\libdns.def"
 LINK32_OBJS= \
@@ -152,6 +182,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\dispatch.obj" \
 	"$(INTDIR)\DLLMain.obj" \
 	"$(INTDIR)\dnssec.obj" \
+	"$(INTDIR)\ds.obj" \
 	"$(INTDIR)\forward.obj" \
 	"$(INTDIR)\journal.obj" \
 	"$(INTDIR)\keytable.obj" \
@@ -164,6 +195,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\name.obj" \
 	"$(INTDIR)\ncache.obj" \
 	"$(INTDIR)\nxt.obj" \
+	"$(INTDIR)\order.obj" \
 	"$(INTDIR)\peer.obj" \
 	"$(INTDIR)\rbt.obj" \
 	"$(INTDIR)\rbtdb.obj" \
@@ -206,8 +238,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\openssldh_link.obj" \
 	"$(INTDIR)\openssldsa_link.obj" \
 	"$(INTDIR)\opensslrsa_link.obj" \
-	"$(INTDIR)\ds.obj" \
-	"$(INTDIR)\order.obj" \
 	"..\..\isc\win32\Release\libisc.lib"
 
 "..\..\..\Build\Release\libdns.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -391,8 +421,42 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6b/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6g/inc32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+MTL=midl.exe
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\libdns.bsc" 
 BSC32_SBRS= \
@@ -410,6 +474,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\dispatch.sbr" \
 	"$(INTDIR)\DLLMain.sbr" \
 	"$(INTDIR)\dnssec.sbr" \
+	"$(INTDIR)\ds.sbr" \
 	"$(INTDIR)\forward.sbr" \
 	"$(INTDIR)\journal.sbr" \
 	"$(INTDIR)\keytable.sbr" \
@@ -422,6 +487,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\name.sbr" \
 	"$(INTDIR)\ncache.sbr" \
 	"$(INTDIR)\nxt.sbr" \
+	"$(INTDIR)\order.sbr" \
 	"$(INTDIR)\peer.sbr" \
 	"$(INTDIR)\rbt.sbr" \
 	"$(INTDIR)\rbtdb.sbr" \
@@ -463,9 +529,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\openssl_link.sbr" \
 	"$(INTDIR)\openssldh_link.sbr" \
 	"$(INTDIR)\openssldsa_link.sbr" \
-	"$(INTDIR)\opensslrsa_link.sbr" \
-	"$(INTDIR)\ds.sbr" \
-	"$(INTDIR)\order.sbr"
+	"$(INTDIR)\opensslrsa_link.sbr"
 
 "$(OUTDIR)\libdns.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
@@ -473,7 +537,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6b/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
+LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../../../openssl-0.9.6g/out32dll/libeay32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libdns.pdb" /map:"$(INTDIR)\libdns.map" /debug /machine:I386 /def:".\libdns.def" /out:"../../../Build/Debug/libdns.dll" /implib:"$(OUTDIR)\libdns.lib" /pdbtype:sept 
 DEF_FILE= \
 	".\libdns.def"
 LINK32_OBJS= \
@@ -491,6 +555,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\dispatch.obj" \
 	"$(INTDIR)\DLLMain.obj" \
 	"$(INTDIR)\dnssec.obj" \
+	"$(INTDIR)\ds.obj" \
 	"$(INTDIR)\forward.obj" \
 	"$(INTDIR)\journal.obj" \
 	"$(INTDIR)\keytable.obj" \
@@ -503,6 +568,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\name.obj" \
 	"$(INTDIR)\ncache.obj" \
 	"$(INTDIR)\nxt.obj" \
+	"$(INTDIR)\order.obj" \
 	"$(INTDIR)\peer.obj" \
 	"$(INTDIR)\rbt.obj" \
 	"$(INTDIR)\rbtdb.obj" \
@@ -545,8 +611,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\openssldh_link.obj" \
 	"$(INTDIR)\openssldsa_link.obj" \
 	"$(INTDIR)\opensslrsa_link.obj" \
-	"$(INTDIR)\ds.obj" \
-	"$(INTDIR)\order.obj" \
 	"..\..\isc\win32\Debug\libisc.lib"
 
 "..\..\..\Build\Debug\libdns.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -556,36 +620,6 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("libdns.dep")
@@ -799,7 +833,7 @@ SOURCE=..\dispatch.c
 
 !IF  "$(CFG)" == "libdns - Win32 Release"
 
-CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6b/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6b/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6g/inc32/openssl/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6g/inc32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 "$(INTDIR)\dispatch.obj" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -809,7 +843,7 @@ CPP_SWITCHES=/nologo /MD /W3 /GX /O2 /I "../../../../../openssl-0.9.6b/inc32/ope
 
 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
 
-CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6b/inc32" /I "../sec/dst/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_SWITCHES=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/dst/include" /I "../../../../openssl-0.9.6g/inc32" /I "../sec/dst/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libdns.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 "$(INTDIR)\dispatch.obj"	"$(INTDIR)\dispatch.sbr" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
@@ -1171,7 +1205,7 @@ SOURCE=..\rbtdb64.c
 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
 
 
-"$(INTDIR)\rbtdb64.obj"	"$(INTDIR)\rbtdb64.sbr" : $(SOURCE) "$(INTDIR)" "..\rbtdb.c"
+"$(INTDIR)\rbtdb64.obj"	"$(INTDIR)\rbtdb64.sbr" : $(SOURCE) "$(INTDIR)"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -1862,24 +1896,24 @@ SOURCE=..\sec\dst\opensslrsa_link.c
 !IF  "$(CFG)" == "libdns - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\dns\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\dns\win32"
 
 !ELSEIF  "$(CFG)" == "libdns - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\dns\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\dns\win32"
 
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 6c1b57a291..791e2fca90 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -408,6 +408,7 @@ isc_win32os_majorversion
 isc_win32os_minorversion
 isc_win32os_servicepackmajor
 isc_win32os_servicepackminor
+isc_win32os_versioncheck
 isc_socket_ipv6only
 isc_region_compare
 isc_socket_filter
diff --git a/lib/isccc/win32/libisccc.mak b/lib/isccc/win32/libisccc.mak
index 9862482362..e9ef539311 100644
--- a/lib/isccc/win32/libisccc.mak
+++ b/lib/isccc/win32/libisccc.mak
@@ -415,24 +415,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libisccc - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\isccc\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\isccc\win32"
 
 !ELSEIF  "$(CFG)" == "libisccc - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\isccc\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a03\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\isccc\win32"
 
diff --git a/lib/isccfg/win32/libisccfg.mak b/lib/isccfg/win32/libisccfg.mak
index 18edaf53f5..c4fccafc37 100644
--- a/lib/isccfg/win32/libisccfg.mak
+++ b/lib/isccfg/win32/libisccfg.mak
@@ -295,24 +295,24 @@ SOURCE=.\version.c
 !IF  "$(CFG)" == "libisccfg - Win32 Release"
 
 "libisc - Win32 Release" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" 
    cd "..\..\isccfg\win32"
 
 "libisc - Win32 ReleaseCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
 !ELSEIF  "$(CFG)" == "libisccfg - Win32 Debug"
 
 "libisc - Win32 Debug" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" 
    cd "..\..\isccfg\win32"
 
 "libisc - Win32 DebugCLEAN" : 
-   cd "\bind-9.3.0a04\lib\isc\win32"
+   cd "..\..\isc\win32"
    $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN 
    cd "..\..\isccfg\win32"
 
diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index 17b23919bc..50fcb54ad1 100644
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -1,6 +1,6 @@
 echo off
 rem
-rem  Copyright (C) 2001  Internet Software Consortium.
+rem  Copyright (C) 2001-2  Internet Software Consortium.
 rem 
 rem  Permission to use, copy, modify, and distribute this software for any
 rem  purpose with or without fee is hereby granted, provided that the above
@@ -25,7 +25,7 @@ rem OpenSSL is a prerequisite for building and running this release of
 rem BIND 9. You must fetch the OpenSSL sources yourself from
 rem http://www.OpenSSL.org/ and compile it yourself.  The code must reside
 rem at the same level as the bind 9.2.0 source tree and it's top-level
-rem directory be named openssl-0.9.6b. This restriction will be lifted in
+rem directory be named openssl-0.9.6g. This restriction will be lifted in
 rem a future release of BIND 9 for Windows NT/2000/XP.
 
 echo Setting up the BIND files required for the build
diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index f95f2da0d7..6747133f4e 100644
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -1,6 +1,6 @@
 echo off
 rem
-rem  Copyright (C) 2000, 2001  Internet Software Consortium.
+rem  Copyright (C) 2000-2002  Internet Software Consortium.
 rem 
 rem  Permission to use, copy, modify, and distribute this software for any
 rem  purpose with or without fee is hereby granted, provided that the above
@@ -32,7 +32,7 @@ rem Generate header files for lib/dns
 call dnsheadergen.bat
 
 echo Ensure that the OpenSSL sources are at the same level in
-echo the directory tree and is named openssl-0.9.6b or libdns
+echo the directory tree and is named openssl-0.9.6g or libdns
 echo will not build. 
 
 rem Make sure that the Build directories are there.
@@ -41,7 +41,7 @@ if NOT Exist ..\Build mkdir ..\Build
 if NOT Exist ..\Build\Release mkdir ..\Build\Release
 
 echo Copying the ARM and the Installation Notes.
- 
+
 copy ..\COPYRIGHT ..\Build\Release
 copy readme1st.txt ..\Build\Release
 copy ..\doc\arm\*.html ..\Build\Release
@@ -50,7 +50,7 @@ copy ..\FAQ ..\Build\Release
 
 echo Copying the OpenSSL DLL.
 
-copy ..\..\openssl-0.9.6b\out32dll\libeay32.dll ..\Build\Release\
+copy ..\..\openssl-0.9.6g\out32dll\libeay32.dll ..\Build\Release\
 
 
 rem Done