diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 30250e2423..b37e4fe4e7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-04 08:28 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * mpkg_win.bat
+    + Added cygwin support.
+
+  * utils/hbmk2/hbmk2.prg
+    * Updated some details on the help screen.
+    - Removed gcc as a valid win target.
+
 2009-03-04 08:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * INSTALL
     * HB_INC_OPENSSL sample corrected to point to real-life header dir.
diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat
index 094d8ced03..01defba020 100644
--- a/harbour/mpkg_win.bat
+++ b/harbour/mpkg_win.bat
@@ -42,9 +42,12 @@ rem ; Cleanup
 if exist %HB_INSTALL_BASE% rmdir /q /s %HB_INSTALL_BASE%
 
 rem ; Build
-if     "%HB_COMPILER%" == "mingw" sh make_gnu.sh clean install
-if not "%HB_COMPILER%" == "mingw" set HB_BUILD_DLL=yes
-if not "%HB_COMPILER%" == "mingw" call make_gnu.bat
+if "%HB_COMPILER%" == "mingw"  ( sh make_gnu.sh clean install && goto MK_PKG )
+if "%HB_COMPILER%" == "cygwin" ( sh make_gnu.sh clean install && goto MK_PKG )
+set HB_BUILD_DLL=yes
+call make_gnu.bat
+
+:MK_PKG
 
 rem ; Installer
 makensis.exe %~dp0mpkg_win.nsi
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index eb09dc0d8c..736d18308d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -441,7 +441,7 @@ FUNCTION Main( ... )
                     { {|| FindInPath( "icc"      ) != NIL }, "icc"     },;
                     { {|| FindInPath( "cygstart" ) != NIL }, "cygwin"  },;
                     { {|| FindInPath( "xcc"      ) != NIL }, "xcc"     } }
-      aCOMPSUP := { "gcc", "mingw", "msvc", "bcc", "owatcom", "pocc", "rsxnt", "xcc", "dmc", "icc", "cygwin",;
+      aCOMPSUP := { "mingw", "msvc", "bcc", "owatcom", "pocc", "rsxnt", "xcc", "dmc", "icc", "cygwin",;
                     "msvc64", "msvcia64", "pocc64",;
                     "mingwce", "msvcce", "poccce" }
       cBin_CompPRG := "harbour.exe"
@@ -2774,8 +2774,9 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  - Regular Harbour compiler options are also accepted." ,;
       "  - Multiple -l, -L and <script> parameters are accepted." ,;
       "  - " + HBMK_CFG_NAME + " option file in hbmk directory is always processed if it" ,;
-      "    exists. On *nix platforms, /usr/local/etc then /etc are checked" ,;
-      "    before the hbmk directory. The file format is .hbp." ,;
+      "    exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour," ,;
+      "    <base>/etc are checked (in that order) before the hbmk directory." ,;
+      "    The file format is the same as .hbp." ,;
       "  - .hbp option files in current dir are automatically processed." ,;
       "  - .hbp options (they should come in separate lines):" ,;
       "    libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]" ,;
@@ -2790,7 +2791,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  - Supported <comp> values for each supported <arch> value:" ,;
       "    linux  : gcc, gpp, owatcom, icc, mingw, mingwce" ,;
       "    darwin : gcc" ,;
-      "    win    : gcc, mingw, msvc, bcc, owatcom, pocc, dmc, rsxnt, icc, cygwin" ,;
+      "    win    : mingw, msvc, bcc, owatcom, pocc, dmc, rsxnt, icc, cygwin" ,;
       "             mingwce, msvc64, msvcia64, msvcce, pocc64, poccce, xcc" ,;
       "    os2    : gcc, owatcom, icc" ,;
       "    dos    : gcc, djgpp, owatcom, rsx32" ,;