diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index a15884174722f55c5401895cf6a943ec993a7af9..9b4165bd5428c22be0c2afce5dbef61895321385 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.43 2007/12/02 22:33:20 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.44 2007/12/19 12:29:36 mha Exp $ -->
 
 <chapter id="install-win32">
  <title>Installation on <productname>Windows</productname></title>
@@ -58,12 +58,11 @@
   Before you build, edit the file <filename>config.pl</filename> to reflect the
   configuration options you want set, including the paths to libraries used.
   If you need to set any other environment variables, create a file called
-  <filename>buildenv.bat</filename> and put the required commands there. For
+  <filename>buildenv.pl</filename> and put the required commands there. For
   example, to add the path for bison when it's not in the PATH, create a file
   containing:
   <screen>
-   @ECHO OFF
-   SET PATH=%PATH%;c:\some\where\bison\bin
+   $ENV{PATH}=$ENV{PATH} . ';c:\some\where\bison\bin';
   </screen>
  </para>
 
@@ -209,10 +208,10 @@
     </userinput>
    </screen>
    To change the default build configuration to debug, put the following
-   in the <filename>buildenv.bat</filename> file:
+   in the <filename>buildenv.pl</filename> file:
    <screen>
     <userinput>
-     set CONFIG=Debug
+     $ENV{CONFIG}="Debug";
     </userinput>
    </screen>
   </para>
@@ -263,7 +262,7 @@
    required parts first. Also, make sure that the DLLs required to load all
    parts of the system (such as the Perl and Python DLLs for the procedural
    languages) are present in the system path. If they are not, set it through
-   the <filename>buildenv.bat</filename> file. To run the tests, run one of
+   the <filename>buildenv.pl</filename> file. To run the tests, run one of
    the following commands from the <filename>src\tools\msvc</filename>
    directory:
    <screen>
@@ -339,11 +338,10 @@
      </para></listitem>
     </varlistentry>
    </variablelist>
-   Edit the <filename>buildenv.bat</filename> file, and add a variable for the
+   Edit the <filename>buildenv.pl</filename> file, and add a variable for the
    location of the root directory, for example:
    <screen>
-    @ECHO OFF
-    SET DOCROOT=c:\docbook
+    $ENV{DOCROOT}='c:\docbook';
    </screen>
    To build the documentation, run the command
    <filename>builddoc.bat</filename>. Note that this will actually run the
diff --git a/src/tools/msvc/builddoc.bat b/src/tools/msvc/builddoc.bat
index 7f92eb39b3831eda0f303f870df1fa6ec46865ab..7268ae207f4c3721d8b001a791c7bbcff8c85675 100755
--- a/src/tools/msvc/builddoc.bat
+++ b/src/tools/msvc/builddoc.bat
@@ -1,7 +1,7 @@
 @echo off
-REM Adjust path for your docbook installation in buildenv.bat
+REM Adjust path for your docbook installation in buildenv.pl
 
-REM $PostgreSQL: pgsql/src/tools/msvc/builddoc.bat,v 1.5 2007/03/17 14:01:01 mha Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/builddoc.bat,v 1.6 2007/12/19 12:29:36 mha Exp $
 
 SETLOCAL
 SET STARTDIR=%CD%
@@ -10,7 +10,12 @@ SET DSSSL=docbook-dsssl-1.79
 
 IF EXIST ..\msvc IF EXIST ..\..\..\src cd ..\..\..
 IF NOT EXIST doc\src\sgml\version.sgml goto noversion
-IF EXIST src\tools\msvc\buildenv.bat CALL src\tools\msvc\buildenv.bat
+
+IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+CALL bldenv.bat
+del bldenv.bat
+:nobuildenv 
 
 IF NOT EXIST %DOCROOT%\%OPENJADE% SET NF=OpenJade
 IF NOT EXIST %DOCROOT%\docbook SET NF=docbook
diff --git a/src/tools/msvc/install.bat b/src/tools/msvc/install.bat
index 3eb8e3ee81aac48653e4c9364247f5964b4820c6..043bc69158b3d7dec9726853200c68b47b314434 100644
--- a/src/tools/msvc/install.bat
+++ b/src/tools/msvc/install.bat
@@ -1,5 +1,5 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/install.bat,v 1.2 2007/06/26 11:43:56 mha Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/install.bat,v 1.3 2007/12/19 12:29:36 mha Exp $
 
 if NOT "%1"=="" GOTO RUN_INSTALL
 
@@ -13,7 +13,12 @@ exit /b 1
 :RUN_INSTALL
 
 SETLOCAL
-if exist buildenv.bat call buildenv.bat
+
+IF NOT EXIST buildenv.pl goto nobuildenv
+perl -e "require 'buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+CALL bldenv.bat
+del bldenv.bat
+:nobuildenv 
 
 perl install.pl "%1"
 
diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat
index 5c8f60f6c063a7789eeebd84054f8fbd0863d1ad..396bfb5b45b34cb78dc17e1107be0291e50d12ee 100755
--- a/src/tools/msvc/pgbison.bat
+++ b/src/tools/msvc/pgbison.bat
@@ -1,7 +1,11 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.7 2007/07/07 07:43:21 mha Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.8 2007/12/19 12:29:36 mha Exp $
 
-if exist src\tools\msvc\buildenv.bat call src\tools\msvc\buildenv.bat
+IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+CALL bldenv.bat
+del bldenv.bat
+:nobuildenv 
 
 SET BV=
 for /F "tokens=4 usebackq" %%f in (`bison -V`) do if "!BV!"=="" SET BV=%%f
diff --git a/src/tools/msvc/pgflex.bat b/src/tools/msvc/pgflex.bat
index 97fd5f24e1fded158bf52692860a53e621eab6eb..f7427117e346d15e68f9a20306fbdc52aacbeee2 100755
--- a/src/tools/msvc/pgflex.bat
+++ b/src/tools/msvc/pgflex.bat
@@ -1,7 +1,11 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/pgflex.bat,v 1.4 2007/03/17 14:01:01 mha Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/pgflex.bat,v 1.5 2007/12/19 12:29:36 mha Exp $
 
-if exist src\tools\msvc\buildenv.bat call src\tools\msvc\buildenv.bat
+IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv
+perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
+CALL bldenv.bat
+del bldenv.bat
+:nobuildenv 
 
 flex -V > NUL
 if errorlevel 1 goto noflex