diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d5159edff9..ecda05b75f 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-07-03 13:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbmsql/msql.h
+    * updated for [Open]Watcom builds. Now DOS OpenWatcom builds
+      works fine except hbbmcdx which needs special trick for long
+      file names. Question: Should we change filenames in this library
+      to 8.3 standard?
+
+  * harbour/config/none.cf
+    ! fixed to work with DOS and pure command.com
+
 2008-07-03 12:40 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/hbcurl/Makefile
    * contrib/hbfimage/Makefile
diff --git a/harbour/config/none.cf b/harbour/config/none.cf
index 70e15ca74b..193a03fc64 100644
--- a/harbour/config/none.cf
+++ b/harbour/config/none.cf
@@ -5,8 +5,15 @@
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
+CMDPREF:=
+ifeq ($(SHLVL),)
+ifneq ($(COMSPEC),)
+CMDPREF:=$(COMSPEC) /C
+endif
+endif
+
 ifneq ($(LIBNAME),)
-   DIR_RULE := @echo "The '$(LIBNAME)' library ignored."
+   DIR_RULE := @$(CMDPREF)echo "The '$(LIBNAME)' library ignored."
 else
    DIR_RULE :=
 endif
diff --git a/harbour/contrib/hbmsql/msql.h b/harbour/contrib/hbmsql/msql.h
index f5b14291e4..6fc3c94234 100644
--- a/harbour/contrib/hbmsql/msql.h
+++ b/harbour/contrib/hbmsql/msql.h
@@ -24,7 +24,7 @@
 #define MSQL_H
 
 #include <sys/types.h>
-#if defined(__BORLANDC__) || defined(_MSC_VER)
+#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__)
 #include <sys/types.h>	/* needed for time_t prototypes */
 #else
 #include <sys/time.h>	/* needed for time_t prototypes */