diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index db0d5b77d5..c938f5b12d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-21 14:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hb-func.sh
+  * utils/hbmk2/hbmk2.prg
+    ! Some three bad typos in recent commit.
+    ! Fixed the way build-default GT is supplied via hbmkcfg file.
+      (via gtdef= line)
+    ! Fixed to fill gtdef= line only if GT was overridden at
+      build time. Previously it was filled with gtstd, which
+      is wrong.
+    ! Temporarily disabled automatic entry point detection,
+      as it needs more complicated management because there
+      needs to be a second C compiler pass. We should try
+      to use some other means to implement this feature IMO.
+
 2009-02-21 13:55 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fix to prev.
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 20a8433dc9..aa2b7252db 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -108,7 +108,7 @@ mk_hbgetlibsctb()
 
 mk_hbtools()
 {
-    local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg
+    local name hb_pref hb_tool hb_libs hb_libsc hb_hbmkcfg hb_gt_ori
 
     name=`get_solibname`
     hb_pref="$4"
@@ -156,6 +156,7 @@ mk_hbtools()
     fi
     hb_libs=`mk_hbgetlibs "$2"`
     hb_libsc=`mk_hbgetlibsctb "$3"`
+    hb_gt_ori=${HB_GT_LIB}
     [ -z "${HB_GT_LIB}" ] && HB_GT_LIB="gtstd"
 
     [ -z "${_DEFAULT_BIN_DIR}" ] && _DEFAULT_BIN_DIR="${HB_BIN_INSTALL}"
@@ -225,8 +226,8 @@ mk_hbtools()
     echo "Generating ${hb_hbmkcfg}... "
     echo "# Harbour Make configuration"> ${hb_hbmkcfg}
     echo "# Generated by Harbour build process">> ${hb_hbmkcfg}
-    if [ -n "${HB_GT_LIB}" ]; then
-        echo "gt=${HB_GT_LIB}">> ${hb_hbmkcfg}
+    if [ -n "${hb_gt_ori}" ]; then
+        echo "gtdef=${hb_gt_ori}">> ${hb_hbmkcfg}
     fi
     if [ -n "${CC_HB_USER_CFLAGS}" ]; then
         echo "cflags=${CC_HB_USER_CFLAGS}">> ${hb_hbmkcfg}
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 12d6362be9..936e3a0687 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -994,7 +994,7 @@ FUNCTION Main( ... )
                AAdd( s_aLIBPATH, "/usr/local/lib" )
             ENDCASE
          ENDIF
-         IF IsGTRequested( s_cGT, s_aLIBUSERGT, "gtxvt" )
+         IF IsGTRequested( s_cGT, s_aLIBUSERGT, "gtxwc" )
             IF hb_DirExists( "/usr/X11R6/lib64" )
                AAdd( s_aLIBPATH, "/usr/X11R6/lib64" )
             ENDIF
@@ -1332,10 +1332,12 @@ FUNCTION Main( ... )
       CASE t_cARCH == "win" .AND. t_cCOMP == "xcc"
       ENDCASE
 
+#if 0
       /* Do entry function detection on platform required and supported */
       IF s_cMAIN == NIL .AND. ! Empty( tmp := getFirstFunc( s_cFIRST ) )
          s_cMAIN := tmp
       ENDIF
+#endif
 
       /* HACK: Override entry point requested by user or detected by us,
                and override the GT if requested by user. */
@@ -1428,7 +1430,6 @@ FUNCTION Main( ... )
             RETURN 5
          ENDIF
          AAdd( s_aC, s_cCSTUB )
-s_cCSTUB := NIL
       ENDIF
 
       /* Library list assembly */
@@ -2038,6 +2039,19 @@ STATIC PROCEDURE HBP_ProcessOne( cFileName,;
          CASE ValueIsF( cLine ) ; lRUN := .F.
          ENDCASE
 
+      CASE Lower( Left( cLine, Len( "gtdef="      ) ) ) == "gtdef="      ; cLine := SubStr( cLine, Len( "gtdef="      ) + 1 )
+         IF ! Empty( cLine )
+            IF ! SetupForGT( cLine, @t_cGTDEFAULT, @lGUI )
+               cLine := NIL
+            ENDIF
+            IF ! Empty( cLine )
+               IF AScan( t_aLIBCOREGT, {|tmp| Lower( tmp ) == Lower( cLine ) } ) == 0 .AND. ;
+                  AScan( aLIBUSERGT  , {|tmp| Lower( tmp ) == Lower( cLine ) } ) == 0
+                  AAddNotEmpty( aLIBUSERGT, PathSepToTarget( cLine ) )
+               ENDIF
+            ENDIF
+         ENDIF
+
       CASE Lower( Left( cLine, Len( "gt="         ) ) ) == "gt="         ; cLine := SubStr( cLine, Len( "gt="         ) + 1 )
          IF ! Empty( cLine )
             IF cGT == NIL
@@ -2063,7 +2077,7 @@ STATIC PROCEDURE HBP_ProcessOne( cFileName,;
          Can be NIL, when it's the Harbour default.
          Isn't necessarily on the aGT list in case it
          is a _non-default_ core GT. */
-STATIC FUNCTION IsGTRequested( aGT, cGT, cWhichGT )
+STATIC FUNCTION IsGTRequested( cGT, aGT, cWhichGT )
 
    /* Checking for the default GT, always requested by core. */
    IF cGT == NIL .AND. t_cGTDEFAULT == cWhichGT
@@ -2076,7 +2090,7 @@ STATIC FUNCTION IsGTRequested( aGT, cGT, cWhichGT )
    ENDIF
 
    /* Checking for user requested GT. */
-   IF AScan( aGT, {|tmp| Lower( tmp ) == Lower( cWhichGT ) } ) > 0
+   IF AScan( aGT, {|tmp| Lower( tmp ) == cWhichGT } ) > 0
       RETURN .T.
    ENDIF