Index: build-amd64.bat
===================================================================
--- build-amd64.bat	(revision 84664)
+++ build-amd64.bat	(working copy)
@@ -1,4 +1,5 @@
 @rem Used by the buildbot "compile" step.
+cd /D "%~dp0\..\.."
 cmd /c Tools\buildbot\external-amd64.bat
 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 cmd /c Tools\buildbot\clean-amd64.bat
Index: build.bat
===================================================================
--- build.bat	(revision 84664)
+++ build.bat	(working copy)
@@ -1,4 +1,5 @@
 @rem Used by the buildbot "compile" step.
+cd /D "%~dp0\..\.."
 cmd /c Tools\buildbot\external.bat
 call "%VS90COMNTOOLS%vsvars32.bat"
 cmd /c Tools\buildbot\clean.bat
Index: buildmsi.bat
===================================================================
--- buildmsi.bat	(revision 84664)
+++ buildmsi.bat	(working copy)
@@ -1,5 +1,5 @@
 @rem Used by the buildbot "buildmsi" step.
-
+cd /D "%~dp0\..\.."
 cmd /c Tools\buildbot\external.bat
 @rem build release versions of things
 call "%VS90COMNTOOLS%vsvars32.bat"
Index: clean.bat
===================================================================
--- clean.bat	(revision 84664)
+++ clean.bat	(working copy)
@@ -1,7 +1,8 @@
 @rem Used by the buildbot "clean" step.
 call "%VS90COMNTOOLS%vsvars32.bat"
 @echo Deleting .pyc/.pyo files ...
+cd /D "%~dp0\..\.."
 del /s Lib\*.pyc Lib\*.pyo
-cd PCbuild
+cd /D "%~dp0\..\..\PCbuild"
 vcbuild /clean pcbuild.sln "Release|Win32"
 vcbuild /clean pcbuild.sln "Debug|Win32"
Index: external-amd64.bat
===================================================================
--- external-amd64.bat	(revision 84664)
+++ external-amd64.bat	(working copy)
@@ -1,6 +1,6 @@
 @rem Fetches (and builds if necessary) external dependencies
 
-@rem Assume we start inside the Python source directory
+cd /D "%~dp0\..\.."
 call "Tools\buildbot\external-common.bat"
 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 
Index: external-common.bat
===================================================================
--- external-common.bat	(revision 84664)
+++ external-common.bat	(working copy)
@@ -1,7 +1,8 @@
 @rem Common file shared between external.bat and external-amd64.bat.  Responsible for
 @rem fetching external components into the root\.. buildbot directories.
 
-cd ..
+cd /D "%~dp0\.."
+
 @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
 @rem the following, check it in, then check it out, comment it out, then check it back in.
 @rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
Index: test-amd64.bat
===================================================================
--- test-amd64.bat	(revision 84664)
+++ test-amd64.bat	(working copy)
@@ -1,3 +1,3 @@
 @rem Used by the buildbot "test" step.
-cd PCbuild
+cd /D "%~dp0\..\..\PCbuild"
 call rt.bat -q -d -x64 -uall -rw
Index: test.bat
===================================================================
--- test.bat	(revision 84664)
+++ test.bat	(working copy)
@@ -1,4 +1,4 @@
 @rem Used by the buildbot "test" step.
-cd PCbuild
+cd /D "%~dp0\..\..\PCbuild"
 call rt.bat -d -q -uall -rw -n