diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0cb8e51899..1481302021 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-07-26 13:18 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/common/hbgete.c
+  * harbour/src/common/hbprintf.c
+  * harbour/src/rtl/arc4.c
+  * harbour/utils/hbmk2/hbmk2.prg
+  * harbour/contrib/hbmysql/hbmysql.hbp
+  * harbour/contrib/sddmy/sddmy.hbp
+    ! fixes for FreeBSD 6.2 build
+      Patch provided by Phil Krylov - many thanks.
+      [TOMERGE 3.0]
+
 2011-07-25 13:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idemain.prg
     + Implemented: Order of "Functions List" is remembered as per 
@@ -27,6 +38,7 @@
     ! fixed to use Harbour STR API instead of hardcoded ANSI CP for
       conversions between Harbour and OLE items.
       Patch provided by Phil Krylov with some minor modifications.
+      [TOMERGE 3.0]
 
 2011-07-22 23:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/hbcom.c
diff --git a/harbour/contrib/hbmysql/hbmysql.hbp b/harbour/contrib/hbmysql/hbmysql.hbp
index 29ef176612..421b5e770d 100644
--- a/harbour/contrib/hbmysql/hbmysql.hbp
+++ b/harbour/contrib/hbmysql/hbmysql.hbp
@@ -13,6 +13,7 @@
 -depcontrol=mysql:no{HB_BUILD_3RDEXT='no'}
 -depcontrol=mysql:${HB_WITH_MYSQL}
 -depincpath=mysql:/usr/include/mysql
+-depincpath=mysql:/usr/local/include/mysql
 -depincpath=mysql:/opt/local/include/mysql5/mysql
 -depimplibs=mysql:../lib/opt/libmySQL.dll
 -depimplibs=mysql:../lib/libmySQL.dll
diff --git a/harbour/contrib/sddmy/sddmy.hbp b/harbour/contrib/sddmy/sddmy.hbp
index 627abb7701..317ff89222 100644
--- a/harbour/contrib/sddmy/sddmy.hbp
+++ b/harbour/contrib/sddmy/sddmy.hbp
@@ -15,6 +15,7 @@
 -depcontrol=mysql:no{HB_BUILD_3RDEXT='no'}
 -depcontrol=mysql:${HB_WITH_MYSQL}
 -depincpath=mysql:/usr/include/mysql
+-depincpath=mysql:/usr/local/include/mysql
 -depincpath=mysql:/opt/local/include/mysql5/mysql
 -depimplibs=mysql:../lib/opt/libmySQL.dll
 -depimplibs=mysql:../lib/libmySQL.dll
diff --git a/harbour/src/common/hbgete.c b/harbour/src/common/hbgete.c
index 205e835729..d5b3171159 100644
--- a/harbour/src/common/hbgete.c
+++ b/harbour/src/common/hbgete.c
@@ -64,6 +64,8 @@
    #define INCL_DOSMISC
    #define INCL_ERRORS
    #include <os2.h>
+#elif defined( __FreeBSD__ )
+   #include <sys/param.h>
 #endif
 
 /* NOTE: Warning, this function _may_ return NULL as a result if
@@ -232,7 +234,8 @@ HB_BOOL hb_setenv( const char * szName, const char * szValue )
          return setenv( szName, "", 1 ) == 0;
       else
          return HB_TRUE;
-#  elif defined( __OpenBSD__ ) || defined( HB_OS_QNX )
+#  elif defined( __OpenBSD__ ) || defined( HB_OS_QNX ) || \
+        ( defined( __FreeBSD_version ) && __FreeBSD_version < 700050 )
       unsetenv( szName );
       return HB_TRUE;
 #  else
diff --git a/harbour/src/common/hbprintf.c b/harbour/src/common/hbprintf.c
index 157992a806..266bc198a8 100644
--- a/harbour/src/common/hbprintf.c
+++ b/harbour/src/common/hbprintf.c
@@ -97,6 +97,10 @@ optimized.
 #include "hbfloat.h"
 #include <stddef.h>
 
+#if defined( __FreeBSD__ )
+#include <sys/param.h>
+#endif
+
 #if defined( HB_LONG_DOUBLE_OFF ) && !defined( __NO_LONGDOUBLE__ )
 #  define __NO_LONGDOUBLE__
 #endif
@@ -166,6 +170,7 @@ optimized.
 #     if defined( __WATCOMC__ ) || defined( __MINGW32CE__ ) || defined( HB_OS_CYGWIN ) || \
          defined( HB_OS_BEOS ) || defined( HB_OS_IPHONE ) || defined( HB_OS_SYMBIAN ) || \
          defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__ ) || \
+         ( defined( __FreeBSD_version ) && __FreeBSD_version < 603000 ) || \
          defined( HB_OS_ANDROID ) || \
          ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) || defined( HB_OS_MINIX )
 #        define _HB_WRAP_MODFL_
diff --git a/harbour/src/rtl/arc4.c b/harbour/src/rtl/arc4.c
index 73cc46e81a..cecb56c1fa 100644
--- a/harbour/src/rtl/arc4.c
+++ b/harbour/src/rtl/arc4.c
@@ -59,8 +59,6 @@
 #  define HAVE_DECL_KERN_RANDOM
 #  if defined( HB_OS_LINUX )
 #     define HAVE_DECL_RANDOM_UUID
-#  else
-#     define HAVE_DECL_KERN_ARND
 #  endif
 #endif
 
@@ -78,6 +76,9 @@
 #  include <sys/types.h>
 #  ifdef HAVE_SYS_SYSCTL_H
 #     include <sys/sysctl.h>
+#     if !defined( HB_OS_LINUX ) && defined( KERN_ARND )
+#        define HAVE_DECL_KERN_ARND
+#     endif
 #  endif
 #  include <fcntl.h>
 #  include <unistd.h>
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 61f0ca7e59..b68f5d08b1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3594,6 +3594,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             ENDCASE
 
             IF ! Empty( cLIB_BASE_PCRE ) .AND. ! hb_FileExists( _HBLIB_FULLPATH( cLIB_BASE_PCRE ) )
+               IF hbmk[ _HBMK_cPLAT ] == "bsd"
+                 AAddNew( hbmk[ _HBMK_aLIBPATH ], "/usr/local/lib" )
+               ENDIF
                AAdd( l_aLIBSYS, "pcre" )
                cLIB_BASE_PCRE := NIL
             ENDIF