diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4ce1755069..f98024f540 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+19990715-09:50 CET Patrick Mast <harbour@PatrickMast.com>
+   *source/rtl/environ.c
+    changed all 'defined(__MSC__)' to 'defined(__MSC__) || defined(_MSC_VER)'
+    It compiles with MSVC++ 6.01 now
+
 19990714-22:45 EDT David G. Holm <dholm@jsd-llc.com>
   * config/dos/djgpp.cf
     * Modified to support new HB_*_COMPILE variables
diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c
index 4838bf8a16..7b15cf8d07 100644
--- a/harbour/source/rtl/environ.c
+++ b/harbour/source/rtl/environ.c
@@ -96,13 +96,13 @@ HARBOUR HB_OS(void)
 #else
 
 /* TODO: add MSVC support but MSVC cannot detect any OS except Windows! */
-#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__MSC__)
+#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__MSC__) || defined(_MSC_VER)
 
 #if defined(_Windows) || defined(_WIN32)
    /* TODO: Determine the Windows type (32s/95/98/NT) and version */
    hb_os = "Windows";
 #else
-#if defined(__MSC__)
+#if defined(__MSC__) || defined(_MSC_VER)
       if (_osmode == _WIN_MODE)
       {
          hb_os = "Windows";