diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index faa514b930..ee5964f8b1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-04 21:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    * MS-DOS LFN vs. SFN next guess: deleted hack when loading
+      plugin.
+
+  * include/hbwmain.c
+  * src/vm/cmdarg.c
+  * config/bin.mk
+    * Cygwin main entry patch from Tamas.
+
+  * INSTALL
+    + Added note that all settings are case sensitive.
+      Not that those would read it who would need to.
+
 2010-11-04 20:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbpp.h
   * harbour/include/hbcomp.h
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 66473399f7..d6d4441f5a 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -610,7 +610,8 @@ HARBOUR
    You can fine-tune Harbour builds with below listed
    environment variables. You can add most of these via the
    GNU Make command line also, using 'make VARNAME=value' syntax.
-   All of these settings are optional.
+   All of these settings are optional and all settings are case
+   sensitive.
 
    General
    -------
diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk
index 5da7218977..9eed82944a 100644
--- a/harbour/config/bin.mk
+++ b/harbour/config/bin.mk
@@ -21,6 +21,9 @@ ifeq ($(BUILD_SHARED),yes)
       hbcplr \
       hbdebug \
 
+   ifeq ($(HB_PLATFORM),cygwin)
+      HB_LIBS_TPL += hbmainstd
+   else
    ifneq ($(filter $(HB_PLATFORM),win wce),)
       ifneq ($(filter $(HB_COMPILER),mingw mingw64 mingwarm),)
          HB_LIBS_TPL += hbmainstd
@@ -40,6 +43,7 @@ ifeq ($(BUILD_SHARED),yes)
       endif
    endif
    endif
+   endif
 
    HB_LIBS_ST_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_ST)
    HB_LIBS_MT_RDD := $(HB_LIBS_TPL) $(HB_DYNLIB_MT)
diff --git a/harbour/include/hbwmain.c b/harbour/include/hbwmain.c
index 84d4ea9b38..38b1cdb390 100644
--- a/harbour/include/hbwmain.c
+++ b/harbour/include/hbwmain.c
@@ -131,6 +131,7 @@ int WINAPI WinMain( HINSTANCE hInstance,      /* handle to current instance */
 #endif
 
 #if defined( HB_VM_STARTUP )
+
    #if !defined( HB_OS_CYGWIN )
       hb_winmainArgInit( hInstance, hPrevInstance, iCmdShow );
    #else
@@ -138,6 +139,7 @@ int WINAPI WinMain( HINSTANCE hInstance,      /* handle to current instance */
       HB_SYMBOL_UNUSED( hPrevInstance );
       HB_SYMBOL_UNUSED( iCmdShow );
    #endif
+
    hb_cmdargInit( s_argc, s_argv );
 
    hb_vmInit( HB_TRUE );
diff --git a/harbour/src/vm/cmdarg.c b/harbour/src/vm/cmdarg.c
index c7a1e679e3..c95d3a70a7 100644
--- a/harbour/src/vm/cmdarg.c
+++ b/harbour/src/vm/cmdarg.c
@@ -81,10 +81,13 @@ static int     s_argc = 0;
 static char ** s_argv = NULL;
 
 #if !defined( HB_OS_WIN )
-static char    s_szAppName[ HB_PATH_MAX ];
+
+   static char    s_szAppName[ HB_PATH_MAX ];
+
    #if defined( HB_OS_CYGWIN )
       static char s_lpAppName[ MAX_PATH ];
    #endif
+
 #else
 
 static char    s_szAppName[ MAX_PATH ];
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index bf3727a9e0..73c7217d05 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7604,15 +7604,7 @@ STATIC PROCEDURE PlugIn_Load( hbmk, cFileName )
 
       hb_FNameSplit( cFileName, NIL, NIL, @cExt )
 
-#if defined( __PLATFORM__DOS )
-      IF hbmk_dos_FileExists( cFileName )
-#else
-      IF .T.
-#endif
-         cFile := hb_MemoRead( cFileName )
-      ELSE
-         cFile := ""
-      ENDIF
+      cFile := hb_MemoRead( cFileName )
 
       IF ! Empty( cFile )
          lOK := .F.