Index: PCbuild/readme.txt
===================================================================
--- PCbuild/readme.txt	(revision 84664)
+++ PCbuild/readme.txt	(working copy)
@@ -186,11 +186,8 @@
 such, a little more work is required in order to download the relevant source 
 files for each project before they can be built.  The buildbots do this each
 time they're built, so the easiest approach is to run either external.bat or 
-external-amd64.bat in the ..\Tools\buildbot directory from ..\, i.e.:
+external-amd64.bat in the ..\Tools\buildbot directory.
 
-    C:\..\svn.python.org\projects\python\trunk\PCbuild>cd ..
-    C:\..\svn.python.org\projects\python\trunk>Tools\buildbot\external.bat
-
 This extracts all the external subprojects from http://svn.python.org/external
 via Subversion (so you'll need an svn.exe on your PATH) and places them in 
 ..\.. (relative to this directory).  The external(-amd64).bat scripts will
Index: Tools/buildbot/build-amd64.bat
===================================================================
--- Tools/buildbot/build-amd64.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/build.bat
===================================================================
--- Tools/buildbot/build.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/buildmsi.bat
===================================================================
--- Tools/buildbot/buildmsi.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/clean.bat
===================================================================
--- Tools/buildbot/clean.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/external-amd64.bat
===================================================================
--- Tools/buildbot/external-amd64.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/external-common.bat
===================================================================
--- Tools/buildbot/external-common.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/external.bat
===================================================================
--- Tools/buildbot/external.bat	(revision 84664)
+++ Tools/buildbot/external.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%\vsvars32.bat"
 
Index: Tools/buildbot/test-amd64.bat
===================================================================
--- Tools/buildbot/test-amd64.bat	(revision 84664)
+++ Tools/buildbot/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: Tools/buildbot/test.bat
===================================================================
--- Tools/buildbot/test.bat	(revision 84664)
+++ Tools/buildbot/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