diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 52d09f953f..84655bfbfa 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-23 12:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed problem with pocc not finding compiled .c objects
+      in some cases.
+      Damn these two compilers pocc and watcom.
+
 2009-06-23 12:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added filter support for input file types .rc, .res, .o, .obj, .c, .cpp.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 663dead24f..edf2cf063c 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2883,11 +2883,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          IF !( hbmk[ _HBMK_cCOMP ] == "xcc" )
             cOpt_CompC += " /Go"
          ENDIF
-         cOpt_CompC += " {FC}"
-         IF lStopAfterCComp .AND. ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( l_aPRG ) + Len( l_aC ) ) == 1
-            cOpt_CompC += " {LC} /Fo{OO}"
-         ELSE
-            cOpt_CompC += " {IC}"
+         cOpt_CompC += " {FC} {IC} /Fo{OO}"
+         IF Empty( cWorkDir )
+            cWorkDir := "."
          ENDIF
          cOptIncMask := "/I{DI}"
          cOpt_Dyn := "{FD} /dll /out:{OD} {DL} {LO} {LL} {LS}"
@@ -2912,11 +2910,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          IF hbmk[ _HBMK_lMT ]
             AAdd( hbmk[ _HBMK_aOPTC ], "/MT" )
          ENDIF
-         IF hbmk[ _HBMK_lINC ]
-            IF ! Empty( cWorkDir )
-               AAdd( hbmk[ _HBMK_aOPTC ], "/Fo{OO}" )
-            ENDIF
-         ENDIF
          cOpt_Link := "/out:{OE} {LO} {DL} {FL} {LL} {LS}"
          cLibPathPrefix := "/libpath:"
          cLibPathSep := " "