diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f8c89e5b08..92f62348c1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,28 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-17 14:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * ChangeLog
+    * Updated VxWorks notes in 2010-07-16 18:22 UTC+0200 Viktor Szakats
+
+  * include/hbsetup.h
+    * Enabled HB_USE_SHARELOCKS_OFF for VxWorks. This fixes creation
+      of plain .dbf files, _but_ it will make a weird bug surface
+      when creating .dbf+.dbt: The content of the .dbt file is
+      written into the .dbf and the .dbt is kept as a zero length
+      file. Przemek if you read this, do you have any idea what
+      this could be?
+
+  * src/rtl/hbgtcore.c
+  * src/rtl/gtsys.c
+    ! Fixed to set default GT for vxworks also in hbgtcore. Made NOTE
+      in source that needs to be kept in sync. This finally fixes
+      the uninitialized GT error.
+    * Reset default vxworks GT to GTSTD instead of GTCGI.
+
+  * utils/hbmk2/hbmk2.prg
+    * Minor.
+
 2010-07-17 12:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbodbc/odbc.c
     - Deleted compatibility trick which mapped SQL[U]LEN to SQL[U]INTEGER.
@@ -193,9 +215,11 @@
                Windows. Simply copying make.exe over with the mingw 3.81
                build makes it work (or setup Workbench to launch
                win-make.exe?). [CLOSED]
-             - Maybet the dbCreate() problem worth looking into, as f.e.
+             - Maybe the dbCreate() problem worth looking into, as f.e.
                hb_out.log and _hbtmp_.dbf were both created fine on the FS,
                but the latter stayed to be a zero length file.
+               HB_USE_SHARELOCKS_OFF changes the situation a bit but
+               still no good.
 
 2010-07-16 09:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idebrowse.prg
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 14aaf3614b..c0856c8331 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -419,6 +419,7 @@
 
 #if defined( HB_OS_VXWORKS )
    #define HB_NO_FNMATCH
+   #define HB_USE_SHARELOCKS_OFF
    /* NOTE: Needed to avoid 'implicit bzero() declaration' warnings */
    extern void bzero( char * buffer, int nbytes );
 #endif
diff --git a/harbour/src/rtl/gtsys.c b/harbour/src/rtl/gtsys.c
index 6ca3e474cd..ecfcfa3378 100644
--- a/harbour/src/rtl/gtsys.c
+++ b/harbour/src/rtl/gtsys.c
@@ -59,6 +59,7 @@
 
 #include "hbgtcore.h"
 
+/* NOTE: Must be in sync with hbgtcore.c */
 #if defined( HB_GT_LIB )
    HB_GT_REQUEST( HB_GT_LIB )
 #elif defined( HB_OS_WIN_CE )
@@ -70,7 +71,7 @@
 #elif defined( HB_OS_OS2 )
    HB_GT_REQUEST( OS2 )
 #elif defined( HB_OS_VXWORKS )
-   HB_GT_REQUEST( CGI )
+   HB_GT_REQUEST( STD )
 #elif defined( HB_OS_UNIX )
    HB_GT_REQUEST( TRM )
 #else
diff --git a/harbour/src/rtl/hbgtcore.c b/harbour/src/rtl/hbgtcore.c
index eacfeaac20..441de2288a 100644
--- a/harbour/src/rtl/hbgtcore.c
+++ b/harbour/src/rtl/hbgtcore.c
@@ -3176,6 +3176,7 @@ static const HB_GT_FUNCS s_gtCoreFunc =
 
 static char s_gtNameBuf[ HB_GT_NAME_MAX_ + 1 ];
 
+/* NOTE: Must be in sync with gtsys.c */
 #if defined( HB_GT_LIB )
    const char * hb_gt_szNameDefault = HB_GT_DRVNAME( HB_GT_LIB );
 #elif defined( HB_OS_WIN_CE )
@@ -3186,6 +3187,8 @@ static char s_gtNameBuf[ HB_GT_NAME_MAX_ + 1 ];
    const char * hb_gt_szNameDefault = "dos";
 #elif defined( HB_OS_OS2 )
    const char * hb_gt_szNameDefault = "os2";
+#elif defined( HB_OS_VXWORKS )
+   const char * hb_gt_szNameDefault = "std";
 #elif defined( HB_OS_UNIX )
    const char * hb_gt_szNameDefault = "trm";
 #else
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 5d3301ec7f..703dd02936 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1149,6 +1149,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          aCOMPSUP := { "gcc", "sunpro" }
       CASE hbmk[ _HBMK_cPLAT ] == "vxworks"
          aCOMPSUP := { "gcc", "diab" }
+      CASE hbmk[ _HBMK_cPLAT ] == "aix"
+         aCOMPSUP := { "gcc", "icc" }
       OTHERWISE
          aCOMPSUP := { "gcc" }
       ENDCASE