diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 12adcb4b86..84238b0e78 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-17 14:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    - Deleted supc++ lib from os2/gcc targets.
+      It causes warnings like this:
+      ---
+      emxomf warning: Undefined stabs type 182 referenced
+      emxomf info: parsing sym no.676 type=1 at char 'xyz' in position 12:context:p182
+      emxomf warning: Cycle detected by make_type.
+      ---
+    ; TODO: Check if C++ built Harbour works with hbmk2 in (default) C mode.
+
 2009-09-17 14:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * bin/hb-func.sh
   * source/rtl/gtcrs/gtcrs.c
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 04c09f8eba..db232b2487 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2446,7 +2446,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             cBin_Res   := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Res, nCmd_Esc )
          ENDIF
 
+#if 0 /* Causes strange linker (emxomf) warnings. */
          AAdd( l_aLIBSYS, "supc++" ) /* NOTE: or stdc++? */
+#endif
 
       CASE hbmk[ _HBMK_cPLAT ] == "dos" .AND. hbmk[ _HBMK_cCOMP ] == "djgpp"