diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b095fc1b43..c7bf2818e9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-18 12:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+  * harbour/config/beos/libs.mk
+    ! use network system library instead of socket in BEOS/HAIKU builds
+
+  * harbour/source/rtl/hbsocket.c
+    ! translate protocol/address families in BEOS/HAIKU builds
+
+    Thanks to Tomas for locating both problems
+
 2009-09-18 12:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     ! Typos.
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index b72f57bbe1..dca10cb525 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -195,7 +195,7 @@ mk_hbtools()
     [ -z "${_DEFAULT_LIB_DIR}" ] && _DEFAULT_LIB_DIR="${HB_LIB_INSTALL}"
 
     if [ "${HB_PLATFORM}" = "beos" ]; then
-        HB_SYS_LIBS="-lroot -lsocket"
+        HB_SYS_LIBS="-lroot -lnetwork"
     else
         HB_SYS_LIBS="-lm"
     fi
@@ -836,7 +836,7 @@ mk_hblibso()
     LIBSMT=""
     gpm="${HB_HAS_GPM}"
     if [ "${HB_PLATFORM}" = "beos" ]; then
-        linker_options="-L/system/lib -lroot -lsocket"
+        linker_options="-L/system/lib -lroot -lnetwork"
     else
         linker_options="-lm"
     fi
diff --git a/harbour/source/rtl/hbsocket.c b/harbour/source/rtl/hbsocket.c
index 43aa32f1ff..c66126b47b 100644
--- a/harbour/source/rtl/hbsocket.c
+++ b/harbour/source/rtl/hbsocket.c
@@ -128,6 +128,10 @@
 #     define HB_HAS_INET6
 #     define HB_HAS_INET6_ADDR_CONST
 #  endif
+#  if defined( HB_OS_BEOS )
+#     define HB_SOCKET_TRANSLATE_DOMAIN
+#     define HB_SOCKET_TRANSLATE_TYPE
+#  endif
 #  if defined( HB_OS_LINUX )
 #     define HB_HAS_SELECT_TIMER
 #  endif