diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 248bb9dedd..5f332328f9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-07-05 22:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    - disabled addition of header and libs paths for optional
+      package managers on bsd platforms. in some situations this
+      may be unwanted.
+      (added in 2010-11-03 19:01 UTC+0100 Viktor Szakats)
+
 2011-07-05 17:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! fixed to put requests to stub code for core GTs when
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ccd29eb6ad..4f7039ba4e 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1777,6 +1777,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    CASE hbmk[ _HBMK_cPLAT ] == "vxworks"
       AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToSelf( GetEnv( "WIND_BASE" ) + "/target/usr/h" ) )
       AAdd( hbmk[ _HBMK_aINCPATH ], PathSepToSelf( GetEnv( "WIND_BASE" ) + "/target/usr/h/wrn/coreip" ) )
+#if 0
    CASE hbmk[ _HBMK_cPLAT ] == "bsd"
       IF hb_DirExists( "/usr/local/lib" ) /* For ports */
          AAddNew( hbmk[ _HBMK_aLIBPATH ], "/usr/local/lib" )
@@ -1790,6 +1791,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       IF hb_DirExists( "/usr/pkg/include" )
          AAdd( hbmk[ _HBMK_aINCPATH ], "/usr/pkg/include" )
       ENDIF
+#endif
    ENDCASE
 
    /* Tweaks to compiler setup */