diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cfdb09c657..4d618f6429 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-12 18:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    % avoid duplicate requests for GT in .c stub
+
 2011-05-12 10:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/xhb/tcgi.prg
     ! = -> ==
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b7529e8ffb..6f95c66d04 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5334,9 +5334,11 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                   /* Always request default GT first */
                   AAdd( array, "HB_GT_" + Upper( SubStr( hbmk[ _HBMK_cGT ], 3 ) ) )
                ENDIF
-               IF ! Empty( hbmk[ _HBMK_aLIBUSERGT ] )
-                  AEval( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | AAdd( array, "HB_GT_" + Upper( SubStr( tmp, 3 ) ) ) } )
-               ENDIF
+               FOR EACH tmp IN hbmk[ _HBMK_aLIBUSERGT ]
+                  IF hbmk[ _HBMK_cGT ] == NIL .OR. !( Upper( SubStr( hbmk[ _HBMK_cGT ], 3 ) ) == Upper( SubStr( tmp, 3 ) ) )
+                     AAdd( array, "HB_GT_" + Upper( SubStr( tmp, 3 ) ) )
+                  ENDIF
+               NEXT
                AEval( hbmk[ _HBMK_aREQUEST ], {| tmp | AAdd( array, tmp ) } )
 
                /* Build C stub */