diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 19a73657d8..0609e52693 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-18 01:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbthread.h
+  * harbour/include/hbdefs.h
+  * harbour/source/vm/dynlibhb.c
+  * harbour/config/bsd/libs.mk
+    ! updated to work with FreeBSD
+
 2009-09-18 00:02 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/filebuf.c
     ! fixed missing FS IO error setting on local lock collisions
diff --git a/harbour/config/bsd/libs.mk b/harbour/config/bsd/libs.mk
index f3f4ac6379..fa8f6546fe 100644
--- a/harbour/config/bsd/libs.mk
+++ b/harbour/config/bsd/libs.mk
@@ -34,6 +34,10 @@ ifneq ($(HB_LINKING_RTL),)
    ifeq ($(HB_HAS_ZLIB_LOCAL),)
       SYSLIBS += z
    endif
+
+   ifneq ($(HB_LINKING_VMMT),)
+      SYSLIBS += pthread
+   endif
 endif
 
 SYSLIBS += m
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 63f706d5b6..c477c9d4f9 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -79,7 +79,8 @@
         ( defined( __DJGPP__ ) && \
           ( __DJGPP__ > 2 || ( __DJGPP__ == 2 && __DJGPP_MINOR__ >= 4 ) ) ) || \
         defined( HB_OS_LINUX ) || defined( HB_OS_DARWIN ) || \
-        defined( HB_OS_SUNOS ) || defined( HB_OS_BEOS ) ) )
+        defined( HB_OS_BSD ) || defined( HB_OS_SUNOS ) || \
+        defined( HB_OS_BEOS ) ) )
    #include <stdint.h>
    /* workaround for BCC 5.8 bug */
    #if ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 )
diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h
index 8645e0ffbb..9ad45466d8 100644
--- a/harbour/include/hbthread.h
+++ b/harbour/include/hbthread.h
@@ -63,7 +63,7 @@
 #  define HB_TASK_THREAD
 #elif defined( HB_OS_LINUX ) || defined( HB_OS_DARWIN ) || \
       defined( HB_OS_SUNOS ) || defined( HB_OS_HPUX ) || \
-      defined( HB_OS_BEOS )
+      defined( HB_OS_BSD ) || defined( HB_OS_BEOS )
 #  include <pthread.h>
 #  define HB_PTHREAD_API
 #elif defined( HB_OS_WIN )
diff --git a/harbour/source/vm/dynlibhb.c b/harbour/source/vm/dynlibhb.c
index 249bfc4bf1..5df375c704 100644
--- a/harbour/source/vm/dynlibhb.c
+++ b/harbour/source/vm/dynlibhb.c
@@ -67,7 +67,7 @@
 #if !defined( HB_HAS_DLFCN ) && \
     ( ( defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) ) || \
       defined( HB_OS_SUNOS ) || defined( HB_OS_DARWIN ) || \
-      defined( HB_OS_BEOS )  )
+      defined( HB_OS_BSD ) || defined( HB_OS_BEOS )  )
 #  define HB_HAS_DLFCN
 #endif