diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 067d64b9c1..1b175db177 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,10 @@
+20000306-17:34 GMT+1 Victor Szakats <info@szelvesz.hu>
+   + include/unistd.h
+   * doc/gmake.txt
+     makefile.vc
+     + Dummy UNISTD.H added to the Harbour /INCLUDE directory to make it
+       compile with MSVC and IBM Visual Age C++ out of the box.
+
 20000306-15:37 GMT+1 Victor Szakats <info@szelvesz.hu>
    * contrib/rdd_ads/ads1.c
      ! FS_* macros renamed to _HB_FS_*
diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt
index 225c393c1f..479ffac491 100644
--- a/harbour/doc/gmake.txt
+++ b/harbour/doc/gmake.txt
@@ -145,8 +145,7 @@ For gcc on Win95/WinNT with the Mingw32 library:
   C_USR             -DHARBOUR_USE_WIN_GTAPI
 
 For MSVC on Win95/WinNT:
-  Notes: You must create an empty unistd.h in the include directory.
-         gnu make is case sensitive!  If your editor converts
+  Notes: gnu make is case sensitive!  If your editor converts
          harbour.c to HARBOUR.C when it saves the file, then gnu make
          _will_not_work.
          If you have MAKE_MODE in your dos environment, make sure it is
@@ -176,7 +175,6 @@ For GCC on OS/2:
               -DHARBOUR_USE_SLN_GTAPI
 
 For IBM Visual Age C++ on OS/2:
-  Note: You must create an empty unistd.h in the IBMCPP\INCLUDE directory.
   HB_ARCHITECTURE   os2
   HB_COMPILER       icc
   C_USR             -DHARBOUR_USE_OS2_GTAPI
diff --git a/harbour/include/unistd.h b/harbour/include/unistd.h
new file mode 100644
index 0000000000..e374e2d81b
--- /dev/null
+++ b/harbour/include/unistd.h
@@ -0,0 +1,18 @@
+/*
+ * $Id$
+ */
+
+/* NOTE: Temporary fix to make Harbour compile with Microsoft Visual C++ (MSVC)
+         on Win32 and IBM Visual Age C++ on OS/2.
+
+         - This file is intentionally empty. 
+         - This file was intentionally not added to Makefile, since the it's 
+           not needed to build a final Harbour application.
+         - The file should not conflict with other platforms since the unistd.h 
+           file is first checked in the compilers include path, and this one 
+           will only be used when it's not found there.
+
+         [vszakats] */
+
+/* TOFIX: This file should be removed when the MSVC/IBMVC issue is solved. 
+          [vszakats] */
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 2ac19b8371..2e3765ab2d 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -13,12 +13,6 @@
 #    (see current one as an example)
 #
 
-#
-# NOTE: In order to compile with MSVC you'll have to create an empty
-#       file with the name UNISTD.H in the \INCLUDE directory, until
-#       the issue is sorted out [vszakats].
-#
-
 #
 # Directory macros. These should never have to change.
 #