diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c58efb6e61..acea524429 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,16 +16,31 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-21 11:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Tackled watcom target platform autodetection to be in
+      sync with global.mk. Whole autodetection should be
+      rewritten in hbmk2 (it's an old TODO).
+    ! Fixed to not show error when trying to create implibs
+      defined in dep spec on platform that don't support it.
+
+  * contrib/make.hbs
+    - Deleted one TODO.
+
+  * ChangeLog
+    ! Typos in prev. Add note new 'option names tentative' yet.
+
 2010-07-21 10:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added mingw/mingw64 version detection. Not very extensively
       tested.
-    + Added -depimplibs=, -depimplibd cmdline options, and depimplibs=
-      and depimplibd .hbc options. They serve to configure automatic
+    + Added -depimplibs=, -depimplibd= cmdline options, and depimplibs=
+      and depimplibd= .hbc options. They serve to configure automatic
       (without stdalone .hbi file using -hbimplib) import library
       generation for dependencies. The internal logic is the same,
       but now implibs can be generated for multiple dependencies
       at once, using pure .hbp files (or eveb .hbc for that matter).
+      (option names tentative)
     + Filters now also support '<' and '>' operators.
     + Filters will now expand internal macros before looking for
       envvars.
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 97b73ccb37..151b390a62 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -47,7 +47,6 @@
      9. Delete Makefiles in contrib area.
     10. Move some logic to hbmk2.
     11. Honor paths found in --hbinfo hbctree{{}} section.
-    12. integrate .hbi functionality into .hbp
  */
 
 #pragma warninglevel=3
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 3e3bcb7788..e89de3faa4 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1458,6 +1458,17 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
                         IF Len( aCOMPDET[ tmp ] ) >= _COMPDET_cCCPOSTFIX
                            hbmk[ _HBMK_cCCPOSTFIX ] := aCOMPDET[ tmp ][ _COMPDET_cCCPOSTFIX ]
                         ENDIF
+                        /* Hack autodetect watcom platform by looking at the header path config. TODO: Do it properly */
+                        IF hbmk[ _HBMK_cCOMP ] == "watcom"
+                           DO CASE
+                           CASE FindInPath( "os2.h", GetEnv( "INCLUDE" ) ) != NIL
+                              hbmk[ _HBMK_cPLAT ] := "os2"
+                           CASE FindInPath( "dirent.h", GetEnv( "INCLUDE" ) ) != NIL
+                              hbmk[ _HBMK_cPLAT ] := "linux"
+                           CASE FindInPath( "windows.h", GetEnv( "INCLUDE" ) ) != NIL
+                              hbmk[ _HBMK_cPLAT ] := "dos"
+                           ENDCASE
+                        ENDIF
                         EXIT
                      ELSE
                         IF hbmk[ _HBMK_lInfo ]
@@ -4480,7 +4491,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
 
    /* Creating implibs requested in dependency specification */
 
-   IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. hbmk[ _HBMK_lDEPIMPLIB ]
+   IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. hbmk[ _HBMK_lDEPIMPLIB ] .AND. ISBLOCK( bBlk_ImpLib )
       FOR EACH tmp IN hbmk[ _HBMK_hDEP ]
          IF tmp[ _HBMKDEP_lFound ] .AND. ! Empty( tmp[ _HBMKDEP_aIMPLIBSRC ] )
             DoIMPLIB( hbmk, bBlk_ImpLib, cLibLibPrefix, cLibLibExt, tmp[ _HBMKDEP_aIMPLIBSRC ], tmp[ _HBMKDEP_cIMPLIBDST ] )