diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 75c02f8ea5..f6518c5bc0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-03 23:58 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * mpkg_win.bat
+    ! Not polluting caller environment vars.
+    * Changed to always override HB_INSTALL_PREFIX to a local temp dir.
+      (to avoid picking up any other misc files accidentally present
+      in a user supplied directory)
+    + Added --deltemp option which will delete the temp install dir.
+    + Completed requirement list.
+
+  * mpkg_win.nsi
+    * Formatting.
+
 2009-03-03 23:56 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com)
   * harbour/contrib/examples/uhttpd/uhttpd.prg
     * Updated uHTTPD (Work in progress)
diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat
index 1b42decc5f..753375620d 100644
--- a/harbour/mpkg_win.bat
+++ b/harbour/mpkg_win.bat
@@ -7,26 +7,29 @@
 rem ---------------------------------------------------------------
 rem Installer creator for Harbour Project
 rem
-rem This script requires:
-rem    - NullSoft Installer
-rem      http://nsis.sourceforge.net
-rem    - makensis.exe in PATH.
-rem    - Windows NT or upper.
-rem
 rem Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
 rem See doc/license.txt for licensing terms.
+rem
+rem This script requires:
+rem    - Windows NT or upper
+rem    - NullSoft Installer installed (NSIS)
+rem      http://nsis.sourceforge.net
+rem    - makensis.exe (part of NSIS) in PATH
+rem    - HB_COMPILER envvar configured (see INSTALL doc)
+rem    - C compiler and GNU Make configured (see INSTALL doc)
 rem ---------------------------------------------------------------
 
 if not "%OS%" == "Windows_NT" goto END
 
-if "%HB_INSTALL_PREFIX%" == "" set HB_INSTALL_PREFIX=%~dp0_install
+setlocal
 
+set HB_INSTALL_PREFIX=%~dp0_hb_install_temp
 set HB_BUILD_DLL=yes
-
 call make_gnu.bat
-
 set HB_VERSION=1.1.0dev
-
 makensis.exe %~dp0mpkg_win.nsi
+if "%1" == "--deltemp" rmdir /q /s %HB_INSTALL_PREFIX%
+
+endlocal
 
 :END
diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi
index 7750b5315b..d6bfb538c2 100644
--- a/harbour/mpkg_win.nsi
+++ b/harbour/mpkg_win.nsi
@@ -34,7 +34,7 @@ OutFile "harbour-$%HB_VERSION%-$%HB_ARCHITECTURE%-$%HB_COMPILER%.exe"
 InstallDir C:\harbour-$%HB_COMPILER%
 
 ;--------------------------------
-;Interface Settings
+; Interface Settings
 
   !define MUI_ABORTWARNING
 
@@ -54,12 +54,12 @@ InstallDir C:\harbour-$%HB_COMPILER%
   !insertmacro MUI_UNPAGE_FINISH
 
 ;--------------------------------
-;Languages
+; Languages
 
   !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
-;License Language String
+; License Language String
 
 LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_DOC_INSTALL%\license.txt"
 
@@ -131,14 +131,14 @@ Section "Start Menu and Desktop icons" hb_shortcuts
 SectionEnd
 
 ;--------------------------------
-;Descriptions
+; Descriptions
 
-  ;Language strings
+  ; Language strings
   LangString DESC_hb_main ${LANG_ENGLISH} "Main components."
   LangString DESC_hb_shortcuts ${LANG_ENGLISH} "Add icons to Start Menu and Desktop."
   LangString DESC_hb_examples ${LANG_ENGLISH} "Samples and tests"
 
-  ;Assign language strings to sections
+  ; Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${hb_main} $(DESC_hb_main)
     !insertmacro MUI_DESCRIPTION_TEXT ${hb_shortcuts} $(DESC_hb_shortcuts)