diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 242723cdc6..d7d4707e1a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-26 01:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * make_gnu.bat
+    + Now make_gnu.bat will find embedded GNU Make even if it's
+      started from another directory. F.e. to rebuild only
+      one contrib or core lib, it's enough to go to that dir
+      and type:
+        ..\..\make_gnu.bat
+    ! More fixes to make build work on paths containing spaces.
+
+  * make_gnu_os2.cmd
+  * make_gnu.bat
+  * make_gnu.sh
+  * mpkg_win.nsi
+  * mpkg_gnu.bat
+    * Formatted header comment.
+    + Added reference to INSTALL.
+
 2009-06-25 21:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbct/justify.c
     ! Fixed typo in one of recent const patches.
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index da53ba1248..f960630f60 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -8,10 +8,9 @@ rem ---------------------------------------------------------------
 rem Copyright 1999-2009 Viktor Szakats (harbour.01 syenar.hu)
 rem See COPYING for licensing terms.
 rem
-rem Initialize environment for GNU Make system to build Harbour
+rem Harbour Project build script (for Windows/DOS)
 rem
-rem For further information about the GNU Make system please
-rem check doc/gmake.txt
+rem Please read INSTALL for further information.
 rem ---------------------------------------------------------------
 
 rem Setup defaults
@@ -129,13 +128,18 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    set _HB_MAKE=make.exe
 
    if not "%HB_ARCHITECTURE%" == "dos" goto _FM_WIN
+   if "%OS%" == "Windows_NT" goto _DOS_NT
    if not exist config\djg-make.exe goto SKIP_WINDLL
    set _HB_MAKE=config\djg-make.exe
-   goto _FM_DONE
+   goto SKIP_WINDLL
+   :_DOS_NT
+   if not exist "%~dp0config\djg-make.exe" goto SKIP_WINDLL
+   set _HB_MAKE="%~dp0config\djg-make.exe"
+   goto SKIP_WINDLL
 
    :_FM_WIN
-   if not exist config\mingw32-make.exe goto _FM_NOLOCAL
-   set _HB_MAKE=config\mingw32-make.exe
+   if not exist "%~dp0config\mingw32-make.exe" goto _FM_NOLOCAL
+   set _HB_MAKE="%~dp0config\mingw32-make.exe"
    goto _FM_DONE
    :_FM_NOLOCAL
    if not "%OS%" == "Windows_NT" goto _FM_DONE
@@ -161,7 +165,6 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    rem It will automatically build Harbour in two passes, one for
    rem the .dlls and a final pass for the regular version.
 
-   if     "%HB_ARCHITECTURE%" == "dos" goto SKIP_WINDLL
    if not "%HB_BUILD_DLL%" == "yes" goto SKIP_WINDLL
 
    if "%HB_COMPILER%%HB_CCPREFIX%" == "mingw64"  set HB_CCPREFIX=x86_64-pc-mingw32-
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index 68bfa64fe5..3c0a1dd7bc 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -5,14 +5,12 @@
 #
 
 # ---------------------------------------------------------------
-# Template to initialize the environment before starting
-# the GNU make system for Harbour
-#
-# For further information about the GNU make system please
-# check doc/gmake.txt
-#
 # Copyright 1999-2001 Viktor Szakats (harbour.01 syenar.hu)
 # See COPYING for licensing terms.
+#
+# Harbour Project build script (for *nix systems)
+#
+# Please read INSTALL for further information.
 # ---------------------------------------------------------------
 
 # ---------------------------------------------------------------
@@ -234,4 +232,3 @@ else
        find . -type d -name "$HB_ARCHITECTURE" | xargs rmdir 2> /dev/null
     fi
 fi
-
diff --git a/harbour/make_gnu_os2.cmd b/harbour/make_gnu_os2.cmd
index 734d48f014..e53d8581f4 100644
--- a/harbour/make_gnu_os2.cmd
+++ b/harbour/make_gnu_os2.cmd
@@ -4,6 +4,12 @@
 
 @echo off
 
+rem ---------------------------------------------------------------
+rem Harbour Project build script (for OS/2)
+rem
+rem Please read INSTALL for further information.
+rem ---------------------------------------------------------------
+
 rem Minimal initialization of environment variables for OS2 GCC build
 rem for further information about see make_gnu.bat
 
diff --git a/harbour/mpkg_gnu.bat b/harbour/mpkg_gnu.bat
index b8725839b7..8aacd99735 100644
--- a/harbour/mpkg_gnu.bat
+++ b/harbour/mpkg_gnu.bat
@@ -5,11 +5,11 @@
 @echo off
 
 rem ---------------------------------------------------------------
-rem Installer creator for Harbour Project
-rem
 rem Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
 rem See COPYING for licensing terms.
 rem
+rem Harbour Project installer creator script (for Windows/DOS)
+rem
 rem This script requires:
 rem    - Windows NT or upper
 rem    - NullSoft Installer installed (NSIS)
@@ -21,6 +21,8 @@ rem      (only for Windows builds)
 rem    - Info-ZIP zip.exe in PATH
 rem         https://sourceforge.net/project/showfiles.php?group_id=118012
 rem    - C compiler configured (see INSTALL doc)
+rem
+rem Please read INSTALL for further information.
 rem ---------------------------------------------------------------
 
 if not "%OS%" == "Windows_NT" echo This Harbour build script requires Windows NT or upper.
diff --git a/harbour/mpkg_win.nsi b/harbour/mpkg_win.nsi
index 8c35996e12..131b1d39f3 100644
--- a/harbour/mpkg_win.nsi
+++ b/harbour/mpkg_win.nsi
@@ -3,20 +3,15 @@
 ;
 
 ; ---------------------------------------------------------------
-; NSIS installer script for Harbour Project
-;
 ; Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
 ; See COPYING for licensing terms.
 ;
-; NOTE: Do not try to use this script directly. It won't work.
+; Harbour Project Nullsoft installer script (for Windows/DOS)
+; [ Do not try to use this script directly. It won't work. ]
 ;
-;       See INSTALL how to create installation packages for
-;       Windows/DOS platforms.
+; Please read INSTALL for further information.
 ; ---------------------------------------------------------------
 
-; TODO: tests/examples
-; TODO: option: install .dlls to system paths
-
   SetCompressor /solid lzma
 
   !include "MUI2.nsh"