--- src/tools/msvc/build.bat.orig	Fri Sep  8 11:49:32 2006
+++ src/tools/msvc/build.bat	Fri Sep  8 11:50:37 2006
@@ -4,7 +4,7 @@
 perl mkvcbuild.pl
 if errorlevel 1 goto :eof
 
-if exist ..\vcbuild if exist ..\src cd ..
+if exist ..\..\..\src\tools\msvc if exist ..\..\..\src cd ..\..\..
 
 if "%1" == "" msbuild pgsql.sln
 if not "%1" == "" vcbuild %1.vcproj
--- src/tools/msvc/mkvcbuild.pl.orig	Fri Sep  8 11:49:45 2006
+++ src/tools/msvc/mkvcbuild.pl	Fri Sep  8 11:52:36 2006
@@ -5,12 +5,12 @@
 use Project;
 use Solution;
 
-chdir('..') if (-d '..\vcbuild' && -d '..\src');
-die 'Must run from root directory or vcbuild directory' unless (-d 'vcbuild' && -d 'src');
-die 'Could not find config.pl' unless (-f 'vcbuild/config.pl');
+chdir('..\..\..') if (-d '..\..\..\src\tools\msvc' && -d '..\..\..\src');
+die 'Must run from root directory or vcbuild directory' unless (-d 'src/tools/msvc' && -d 'src');
+die 'Could not find config.pl' unless (-f 'src/tools/msvc/config.pl');
 
 our $config;
-require 'vcbuild/config.pl';
+require 'src/tools/msvc/config.pl';
 
 my $solution = new Solution($config);