diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 49ad645927..e1f2e87522 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,12 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-08 21:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbextern.ch
+    + Added new HB_SOCKET*() functions.
+
+  * config/postinst.prg
+    ! Fixed to exclude whole extra shared binary creation for
+      all platforms except win/wce/os2.
+
+  + examples/udpds/udpds.hbp
+    + Added hbmk2 make file.
+
 2010-06-08 21:54 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   + harbour/src/rtl/hbsockhb.c
     + added wrapper functions for Harbour socket API
       The list of exported functions is:
         HB_SOCKETGETERROR() --> nSocketError
-        HB_SOCKETGETOSERROR() --> nOSError 
+        HB_SOCKETGETOSERROR() --> nOSError
         HB_SOCKETERRORSTRING( [ nSocketErrror = hb_socketGetError() ] ) --> cError
         HB_SOCKETGETSOCKNAME( hSocket ) --> aAddr | NIL
         HB_SOCKETGETPEERNAME( hSocket ) --> aAddr | NIL
@@ -60,22 +71,22 @@
     + added UDP Discovery Server sample
 
       This module demonstrates a simple UDP Discovery Server
-     
+
       If you run some service on the network (ex., netio), you need to
       know server IP address and configure client to connect to this
       address. UDPDS helps client to find server address (or addresses
       of multiple servers) on local network. UDPDS should be run in
       parallel to real server (ex., netio). Server part of UDPDS uses
       threads, so, it should be compiled in MT mode.
-     
+
       Server functions:
         UDPDS_Start( nPort, cName [, cVersion ] ) --> hServer
-        UDPDS_Stop( hServer ) 
-        
+        UDPDS_Stop( hServer )
+
       Client function:
         UDPDS_Find( nPort, cName ) --> { {"ip_addr_1", "version_1"}, ... }
 
-    ; Please add .hbc, .hbp files, if it is required. This module requires 
+    ; Please add .hbc, .hbp files, if it is required. This module requires
       only a standard harbour runtime library and MT VM.
 
 2010-06-08 20:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/config/postinst.prg b/harbour/config/postinst.prg
index 466bce8279..d630f02be1 100644
--- a/harbour/config/postinst.prg
+++ b/harbour/config/postinst.prg
@@ -123,7 +123,7 @@ PROCEDURE Main()
 
    /* Creating shared version of Harbour binaries */
 
-   IF !( GetEnv( "HB_PLATFORM" ) $ "dos|linux" ) .AND. ;
+   IF GetEnv( "HB_PLATFORM" ) $ "win|wce|os2" .AND. ;
       !( GetEnv( "HB_BUILD_DLL" ) == "no" ) .AND. ;
       !( GetEnv( "HB_BUILD_SHARED" ) == "yes" ) .AND. ;
       ! Empty( GetEnv( "HB_HOST_BIN_DIR" ) )
diff --git a/harbour/examples/udpds/udpds.hbp b/harbour/examples/udpds/udpds.hbp
new file mode 100644
index 0000000000..45dc4bf973
--- /dev/null
+++ b/harbour/examples/udpds/udpds.hbp
@@ -0,0 +1,6 @@
+#
+# $Id$
+#
+
+*.prg
+-mt
diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch
index f2dbff04a4..5c16e9b398 100644
--- a/harbour/include/hbextern.ch
+++ b/harbour/include/hbextern.ch
@@ -1162,6 +1162,41 @@ EXTERNAL HB_REGEXSPLIT
 EXTERNAL HB_REGEXATX
 EXTERNAL HB_REGEXALL
 
+EXTERNAL HB_SOCKETGETERROR
+EXTERNAL HB_SOCKETGETOSERROR
+EXTERNAL HB_SOCKETERRORSTRING
+EXTERNAL HB_SOCKETGETSOCKNAME
+EXTERNAL HB_SOCKETGETPEERNAME
+EXTERNAL HB_SOCKETOPEN
+EXTERNAL HB_SOCKETCLOSE
+EXTERNAL HB_SOCKETSHUTDOWN
+EXTERNAL HB_SOCKETBIND
+EXTERNAL HB_SOCKETLISTEN
+EXTERNAL HB_SOCKETACCEPT
+EXTERNAL HB_SOCKETCONNECT
+EXTERNAL HB_SOCKETSEND
+EXTERNAL HB_SOCKETSENDTO
+EXTERNAL HB_SOCKETRECV
+EXTERNAL HB_SOCKETRECVFROM
+EXTERNAL HB_SOCKETSETBLOCKINGIO
+EXTERNAL HB_SOCKETSETNODELAY
+EXTERNAL HB_SOCKETSETREUSEADDR
+EXTERNAL HB_SOCKETSETKEEPALIVE
+EXTERNAL HB_SOCKETSETBROADCAST
+EXTERNAL HB_SOCKETSETSNDBUFSIZE
+EXTERNAL HB_SOCKETSETRCVBUFSIZE
+EXTERNAL HB_SOCKETGETSNDBUFSIZE
+EXTERNAL HB_SOCKETGETRCVBUFSIZE
+EXTERNAL HB_SOCKETSETMULTICAST
+EXTERNAL HB_SOCKETSELECTREAD
+EXTERNAL HB_SOCKETSELECTWRITE
+EXTERNAL HB_SOCKETSELECTWRITEEX
+EXTERNAL HB_SOCKETSELECT
+EXTERNAL HB_SOCKETRESOLVEINETADDR
+EXTERNAL HB_SOCKETRESOLVEADDR
+EXTERNAL HB_SOCKETGETHOSTS
+EXTERNAL HB_SOCKETGETIFACES
+
 EXTERNAL HB_INETINIT
 EXTERNAL HB_INETCLEANUP
 EXTERNAL HB_INETCREATE