diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 36f9db51ac..56b5f2cca5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-15 20:54 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * tests/multifnc/Makefile
+  * doc/gmake.txt
+  * bin/hb-func.sh
+  * bin/postinst.sh
+  * include/hbdefs.h
+  * source/vm/Makefile
+  * source/vm/vmmt/Makefile
+    ! Changed mingw32 to mingw in remaining places.
+
 2008-09-15 17:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbthread.h
     + added assembler MT version of HB_ATOM_INC/HB_ATOM_DEC operation
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index db8057598c..a75250dd3e 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -152,7 +152,7 @@ mk_hbtools()
         HB_SYS_LIBS="-lz ${HB_SYS_LIBS}"
         hb_libs="${hb_libs//hbzlib/}"
     fi
-    if [ "${HB_COMPILER}" = "mingw32" ]; then
+    if [ "${HB_COMPILER}" = "mingw" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lwsock32 -lws2_32"
     elif [ "${HB_COMPILER}" = "mingwce" ]; then
         HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32"
@@ -493,7 +493,7 @@ else
 fi
 
 l=""
-if [ "\${HB_COMPILER}" = "mingw32" ]; then
+if [ "\${HB_COMPILER}" = "mingw" ]; then
     if [ -z "\${HB_MODE}" ]; then
         LN_OPT="\${LN_OPT} -mwindows"
         l="hbmainwin"
diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh
index 4c9b3b9a37..c9c207cc89 100755
--- a/harbour/bin/postinst.sh
+++ b/harbour/bin/postinst.sh
@@ -41,7 +41,7 @@ fi
 . ${hb_root}/bin/hb-func.sh
 
 if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \
-   [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "mingwce" ] || \
+   [ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ] || \
    [ "$HB_COMPILER" = "djgpp" ]
 then
     RANLIB=""
@@ -78,7 +78,7 @@ then
     fi
     mk_hbtools "${HB_BIN_INSTALL}" "$@"
     if [ "$HB_COMPILER" = "gcc" ] || [ "$HB_COMPILER" = "gpp" ] || \
-       [ "$HB_COMPILER" = "mingw32" ] || [ "$HB_COMPILER" = "mingwce" ]; then
+       [ "$HB_COMPILER" = "mingw" ] || [ "$HB_COMPILER" = "mingwce" ]; then
         mk_hblibso "${hb_root}"
     fi
     # build hbfm lib with memory statistic
diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt
index 1ad7c733b1..42cb9e4a58 100644
--- a/harbour/doc/gmake.txt
+++ b/harbour/doc/gmake.txt
@@ -146,9 +146,9 @@ For gcc on Win95/WinNT with the Cygwin library:
   C_USR             -mwin32
   L_USR             -mwin32
 
-For gcc on Win95/WinNT with the Mingw32 library:
+For gcc on Win95/WinNT with the MinGW library:
   HB_ARCHITECTURE   w32
-  HB_COMPILER       mingw32
+  HB_COMPILER       mingw
   HB_GT_LIB         gtwin
 
 For MSVC on Win95/WinNT:
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index bc9d31e402..99a5904e13 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -1292,4 +1292,10 @@ typedef BYTE HB_ATTR;
 #define HB_CHAR_SOFT1           ( ( char ) 141 )
 #define HB_CHAR_SOFT2           ( ( char ) HB_CHAR_LF )
 
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__) || defined(__XCC__) || defined(__DMC__)
+   #pragma comment( lib, "" )
+#endif
+
+
+
 #endif /* HB_DEFS_H_ */
diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile
index 776ddc1616..03d7169634 100644
--- a/harbour/source/vm/Makefile
+++ b/harbour/source/vm/Makefile
@@ -5,7 +5,7 @@
 ROOT = ../../
 
 ifeq ($(HB_ARCHITECTURE),w32)
-	ifeq ($(HB_COMPILER),mingw32)
+	ifeq ($(HB_COMPILER),mingw)
 		C_MAIN = mainwin.c
 		DIRS = mainstd
 	else
diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile
index d37b78016e..1b1bee792a 100644
--- a/harbour/source/vm/vmmt/Makefile
+++ b/harbour/source/vm/vmmt/Makefile
@@ -8,7 +8,7 @@ vpath %.prg ../
 ROOT = ../../../
 
 ifeq ($(HB_ARCHITECTURE),w32)
-	ifeq ($(HB_COMPILER),mingw32)
+	ifeq ($(HB_COMPILER),mingw)
 		C_MAIN = mainwin.c
 		DIRS = mainstd
 	else
diff --git a/harbour/tests/multifnc/Makefile b/harbour/tests/multifnc/Makefile
index 4191ffb901..5197edae09 100644
--- a/harbour/tests/multifnc/Makefile
+++ b/harbour/tests/multifnc/Makefile
@@ -11,7 +11,7 @@ else
 ifeq ($(HB_COMPILER),djgpp)
 L_USR += -Wl,--allow-multiple-definition
 else
-ifeq ($(HB_COMPILER),mingw32)
+ifeq ($(HB_COMPILER),mingw)
 L_USR += -Wl,--allow-multiple-definition
 else
 ifeq ($(HB_COMPILER),xcc)