diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b1e6f94322..ad489f65dd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-04 17:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/os2/gcc.mk
+    * Changed to use GCC default extensions for objects and libs 
+      even in OMF mode.
+    ! This fixed hbmk2 problems reported by David Arturo Macias Corona.
+    ; Please verify if now also changed lib extension didn't create 
+      any new problem in hbmk2, f.e. when using -strip option.
+
 2009-11-04 09:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Added EXAMPLEs for Windows SDK 7. There is included compiler 
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 9d78b51b17..4d5249b3e2 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -8,15 +8,9 @@ else
    HB_CMP := gcc
 endif
 
-ifeq ($(HB_COMPILER),gccomf)
-   OBJ_EXT := .obj
-   LIB_PREF :=
-   LIB_EXT := .lib
-else
-   OBJ_EXT := .o
-   LIB_PREF :=
-   LIB_EXT := .a
-endif
+OBJ_EXT := .o
+LIB_PREF :=
+LIB_EXT := .a
 
 CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ddcc3e1941..868fec124d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2503,11 +2503,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cLibLibPrefix := "lib"
          cLibPrefix := "-l"
          cLibExt := ""
-         IF hbmk[ _HBMK_cCOMP ] == "gccomf"
-            cObjExt := ".obj"
-         ELSE
-            cObjExt := ".o"
-         ENDIF
+         cObjExt := ".o"
          cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( hbmk[ _HBMK_lCPP ] != NIL .AND. hbmk[ _HBMK_lCPP ], "g++", "gcc" ) + hbmk[ _HBMK_cCCPOSTFIX ] + cCCEXT
          cOpt_CompC := "-c"
          IF hbmk[ _HBMK_lOPTIM ]
@@ -2528,15 +2524,14 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          cOpt_Link := "{LO} {LA} {FL} {DL}"
          cLibPathPrefix := "-L"
          cLibPathSep := " "
+         cLibLibExt := ".a"
          IF hbmk[ _HBMK_cCOMP ] == "gccomf"
-            cLibLibExt := ".lib"
             cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "emxomfar" + cCCEXT
 
             AAdd( hbmk[ _HBMK_aOPTC ], "-Zomf" )
             AAdd( hbmk[ _HBMK_aOPTL ], "-Zomf" )
             AAdd( hbmk[ _HBMK_aOPTD ], "-Zomf" )
          ELSE
-            cLibLibExt := ".a"
             cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "ar" + cCCEXT
          ENDIF
          cOpt_Lib := "{FA} rcs {OL} {LO}"