diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2201c17729..aab34b4166 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-15 23:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * examples/uhttpd2/socket.c
+    * Minor formatting.
+
+  * examples/uhttpd2/items.dbf
+    * Updated with content. Thanks Mindaugas.
+
 2009-06-15 20:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * examples/superlib/readme.txt
   * examples/dbu/readme.txt
diff --git a/harbour/examples/uhttpd2/items.dbf b/harbour/examples/uhttpd2/items.dbf
index c85d5d1302..b74fa33821 100644
Binary files a/harbour/examples/uhttpd2/items.dbf and b/harbour/examples/uhttpd2/items.dbf differ
diff --git a/harbour/examples/uhttpd2/socket.c b/harbour/examples/uhttpd2/socket.c
index 149356b465..2ba5a674de 100644
--- a/harbour/examples/uhttpd2/socket.c
+++ b/harbour/examples/uhttpd2/socket.c
@@ -152,7 +152,7 @@ static PHB_ITEM hb_itemPutSockaddr( PHB_ITEM pItem, const struct sockaddr* saddr
 }
 
 
-HB_FUNC ( SOCKET_INIT )
+HB_FUNC( SOCKET_INIT )
 {
 #if defined( HB_OS_WIN )
    WSADATA  wsad;
@@ -165,7 +165,7 @@ HB_FUNC ( SOCKET_INIT )
 }
 
 
-HB_FUNC ( SOCKET_EXIT )
+HB_FUNC( SOCKET_EXIT )
 {
 #if defined( HB_OS_WIN )
    hb_retni( WSACleanup() );
@@ -175,7 +175,7 @@ HB_FUNC ( SOCKET_EXIT )
 }
 
 
-HB_FUNC ( SOCKET_ERROR )
+HB_FUNC( SOCKET_ERROR )
 {
 #if defined( HB_OS_WIN )
    hb_retni( WSAGetLastError() );
@@ -185,7 +185,7 @@ HB_FUNC ( SOCKET_ERROR )
 }
 
 
-HB_FUNC ( SOCKET_CREATE )
+HB_FUNC( SOCKET_CREATE )
 {
    hb_retsocket( socket( hb_parnidef( 1, PF_INET ),
                          hb_parnidef( 2, SOCK_STREAM ),
@@ -193,7 +193,7 @@ HB_FUNC ( SOCKET_CREATE )
 }
 
 
-HB_FUNC ( SOCKET_CLOSE )
+HB_FUNC( SOCKET_CLOSE )
 {
 #if defined( HB_OS_WIN )
    hb_retni( closesocket( hb_parsocket( 1 ) ) );
@@ -203,7 +203,7 @@ HB_FUNC ( SOCKET_CLOSE )
 }
 
 
-HB_FUNC ( SOCKET_BIND )
+HB_FUNC( SOCKET_BIND )
 {
    struct sockaddr   sa;
 
@@ -212,13 +212,13 @@ HB_FUNC ( SOCKET_BIND )
 }
 
 
-HB_FUNC ( SOCKET_LISTEN )
+HB_FUNC( SOCKET_LISTEN )
 {
    hb_retni( listen( hb_parsocket( 1 ), hb_parnidef( 2, 10 ) ) );
 }
 
 
-HB_FUNC ( SOCKET_ACCEPT )
+HB_FUNC( SOCKET_ACCEPT )
 {
    PHB_ITEM          pItem;
    SOCKET            socket = hb_parsocket( 1 );
@@ -239,7 +239,7 @@ HB_FUNC ( SOCKET_ACCEPT )
 }
 
 
-HB_FUNC ( SOCKET_SHUTDOWN )
+HB_FUNC( SOCKET_SHUTDOWN )
 {
    SOCKET   socket = hb_parsocket( 1 );
    int      i = hb_parnidef( 2, SHUT_RDWR );
@@ -251,7 +251,7 @@ HB_FUNC ( SOCKET_SHUTDOWN )
 }
 
 
-HB_FUNC ( SOCKET_RECV )
+HB_FUNC( SOCKET_RECV )
 {
    SOCKET   socket = hb_parsocket( 1 );
    int      iLen, iRet, iFlags = hb_parnidef( 4, 0 );
@@ -274,7 +274,7 @@ HB_FUNC ( SOCKET_RECV )
 }
 
 
-HB_FUNC ( SOCKET_SEND )
+HB_FUNC( SOCKET_SEND )
 {
    SOCKET   socket = hb_parsocket( 1 );
    char*    pBuf = hb_parc( 2 );
@@ -288,7 +288,7 @@ HB_FUNC ( SOCKET_SEND )
 }
 
 
-HB_FUNC ( SOCKET_SELECT )
+HB_FUNC( SOCKET_SELECT )
 {
    fd_set             setread, setwrite, seterror;
    BOOL               bRead = 0, bWrite = 0, bError = 0;
@@ -442,7 +442,7 @@ HB_FUNC ( SOCKET_SELECT )
 }
 
 
-HB_FUNC ( SOCKET_GETSOCKNAME )
+HB_FUNC( SOCKET_GETSOCKNAME )
 {
    PHB_ITEM          pItem;
    struct sockaddr   saddr;
@@ -458,7 +458,7 @@ HB_FUNC ( SOCKET_GETSOCKNAME )
 }
 
 
-HB_FUNC ( SOCKET_GETPEERNAME )
+HB_FUNC( SOCKET_GETPEERNAME )
 {
    PHB_ITEM          pItem;
    struct sockaddr   saddr;
@@ -474,7 +474,7 @@ HB_FUNC ( SOCKET_GETPEERNAME )
 }
 
 
-HB_FUNC ( SOCKET_CONNECT )
+HB_FUNC( SOCKET_CONNECT )
 {
    SOCKET   socket = hb_parsocket( 1 );
    struct sockaddr   sa;
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ccb7ce158a..8010dda7fe 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -91,8 +91,6 @@
          we need to use -o Harbour switch, it will be a problem also when
          user tries to use -p option, .ppo files will be generated in temp
          dir. */
-/* TODO: Add support for library creation for rest of compilers. */
-/* TODO: Add support for dynamic library creation for rest of compilers. */
 /* TODO: Further clean hbmk context var usage (hbmk2 scope, project scope,
          adding rest of variables). */
 /* TODO: Add a way to fallback to stop if required headers couldn't be found.
@@ -4790,7 +4788,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel  )
             ENDIF
          NEXT
 
-      CASE Lower( Left( cLine, Len( "hbcs="         ) ) ) == "hbcs="         ; cLine := SubStr( cLine, Len( "hbcs="         ) + 1 )
+      CASE Lower( Left( cLine, Len( "hbcs="        ) ) ) == "hbcs="          ; cLine := SubStr( cLine, Len( "hbcs="         ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             IF nNestingLevel < _HBMK_NEST_MAX
 
@@ -4845,7 +4843,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel  )
             ENDIF
          NEXT
 
-      CASE Lower( Left( cLine, Len( "instpaths="   ) ) ) == "instpaths="   ; cLine := SubStr( cLine, Len( "instpaths="   ) + 1 )
+      CASE Lower( Left( cLine, Len( "instpaths="    ) ) ) == "instpaths="    ; cLine := SubStr( cLine, Len( "instpaths="    ) + 1 )
          FOR EACH cItem IN hb_ATokens( cLine,, .T. )
             cItem := PathSepToTarget( hbmk, PathProc( MacroProc( hbmk, StrStripQuote( cItem ), FN_DirGet( cFileName ) ), FN_DirGet( cFileName ) ) )
             IF AScan( hbmk[ _HBMK_aINSTPATH ], {|tmp| tmp == cItem } ) == 0