diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0845916a85..3c421004b1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,21 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-16 15:18 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * INSTALL
+    + Added 3.81 or upper as GNU Make requirement. Older ones
+      have bugs exploitet by current .cf files.
+
+  * contrib/hbssl/Makefile
+    - Disabled for owatcom.
+
+  * config/win/msvc.cf
+    ! Fixed -TP switch. Stopped using CFLAGS.
+    * Changed to use link.exe directly instead of cl.exe.
+
+  * config/win/msvcce.cf
+    * Minor cleanup.
+
 2009-03-16 13:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Added support for win/mingwce.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index f07544a1b8..133f8e30af 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -19,7 +19,7 @@ HOW TO BUILD AND INSTALL HARBOUR
    For all platforms you'll need:
 
    * Supported ANSI C compiler
-   * GNU Make
+   * GNU Make (3.81 or upper)
 
    Linux/Darwin/BSD/HP-UX/Solaris
    ------------------------------
@@ -75,8 +75,7 @@ HOW TO BUILD AND INSTALL HARBOUR
           relevant section of this file.
       3.) Make sure to have GNU Make. Certain older versions and builds
           are untested and may not work. We recommend the one distributed
-          by MinGW team. The latest, tested version is 3.81 at the time of
-          this writing. Use this link to get it:
+          by MinGW team. Use this link to get it:
             https://sourceforge.net/project/showfiles.php?group_id=2435&package_id=23918
           If you have it, you have three choices:
           - Copy mingw32-make.exe or make.exe into a separate directory
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index 4145fea9ac..d1caea2f4c 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -12,37 +12,36 @@ LIB_EXT = .lib
 CC = cl.exe
 CC_IN = -c
 CC_OUT = -Fo
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -nologo -W4 -wd4127 -Gs -TP
+CPPFLAGS = -nologo -W4 -wd4127 -Gs -I. -I$(HB_INC_COMPILE) -TP
 
 ifneq ($(HB_BUILD_OPTIM),no)
 ifeq ($(HB_VISUALC_VER_PRE80),)
-CFLAGS += -Ot2b1 -EHs-c-
+CPPFLAGS += -Ot2b1 -EHs-c-
 else
-CFLAGS += -Ogt2yb1p -GX- -G6 -YX
+CPPFLAGS += -Ogt2yb1p -GX- -G6 -YX
 endif
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -MTd -Zi
+CPPFLAGS += -MTd -Zi
 else
-CFLAGS += -MT
+CPPFLAGS += -MT
 endif
 
 # # NOTE: -GA flag should be disabled when building MT _.dlls_,
 # #       as it creates bad code according to MS docs [vszakats].
 # ifeq ($(HB_VISUALC_VER_PRE70),)
-# CFLAGS += -GA
+# CPPFLAGS += -GA
 # endif
 
-LD = cl.exe
-LD_OUT = -Fe
+LD = link.exe
+LD_OUT = /out:
 
 # Add all libraries specified in CONTRIBS and LIBS.
 ifeq ($(HB_LIB_COMPILE),)
-LINKPATHS += /link /libpath:$(LIB_DIR)
+LINKPATHS += /libpath:$(LIB_DIR)
 else
-LINKPATHS += /link /libpath:$(HB_LIB_COMPILE)
+LINKPATHS += /libpath:$(HB_LIB_COMPILE)
 endif
 LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
 LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
@@ -57,7 +56,7 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
-LDFLAGS = $(LINKPATHS) user32.lib wsock32.lib advapi32.lib gdi32.lib
+LDFLAGS = /nologo $(LINKPATHS) user32.lib wsock32.lib advapi32.lib gdi32.lib
 
 AR = lib.exe
 ARFLAGS = $(HB_USER_AFLAGS)
diff --git a/harbour/config/win/msvcce.cf b/harbour/config/win/msvcce.cf
index 8da5469fbe..48399568fb 100644
--- a/harbour/config/win/msvcce.cf
+++ b/harbour/config/win/msvcce.cf
@@ -68,7 +68,7 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
 LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
 endif
 
-LDFLAGS = $(LINKPATHS) $(HB_USER_LDFLAGS)
+LDFLAGS = $(LINKPATHS)
 
 AR = lib.exe
 ARFLAGS = $(HB_USER_AFLAGS)
diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile
index eedad73454..a0adfe72e0 100644
--- a/harbour/contrib/hbssl/Makefile
+++ b/harbour/contrib/hbssl/Makefile
@@ -9,6 +9,7 @@ LIBNAME=hbssl
 HB_INC_OPENSSL_OK =
 
 ifneq ($(HB_ARCHITECTURE),dos)
+ifneq ($(HB_COMPILER),owatcom)
 
 ifeq ($(HB_INC_OPENSSL),)
 ifeq ($(HB_XBUILD),)
@@ -44,3 +45,6 @@ install::
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif