diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7cc91f49ba..129aca200d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-17 16:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/external/libpng/Makefile
+    * disabled when XCC compiler is used - it cannot compile it
+
+  * harbour/contrib/hbnetio/netiomt.prg
+    * updated comment with NETIO_MTSERVER() syntax
+
+  * harbour/contrib/hbnetio/netiosrv.c
+    * minor formatting
+
 2009-09-17 15:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/netiosrv.prg
     + Added header.
diff --git a/harbour/contrib/hbnetio/netiomt.prg b/harbour/contrib/hbnetio/netiomt.prg
index d7ed9a6099..3b1554f381 100644
--- a/harbour/contrib/hbnetio/netiomt.prg
+++ b/harbour/contrib/hbnetio/netiomt.prg
@@ -8,7 +8,8 @@
  *    very simple TCP/IP file server.
  *    All files which names starts 'net:' are redirected to this API.
  *    This is code for simple MT server which is activated by:
- *       NETIO_MTSERVER( [<nPort>], [<cAddress>] ) -> <pListenSocket> | NIL
+ *       NETIO_MTSERVER( [<nPort>], [<cAddress>], [<cRootDir>] )
+                                                -> <pListenSocket> | NIL
  *    and can be stopped by:
  *       NETIO_SERVERSTOP( <pListenSocket>, .T. )
  *
diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c
index bd65328e9e..f23a824112 100644
--- a/harbour/contrib/hbnetio/netiosrv.c
+++ b/harbour/contrib/hbnetio/netiosrv.c
@@ -138,8 +138,7 @@ static const char * s_consrvFilePath( char * pszFileName, PHB_CONSRV conn )
       pszFileName = NULL;
    else if( conn->rootPathLen )
    {
-      memmove( pszFileName + conn->rootPathLen, pszFileName,
-               iPos + 1 );
+      memmove( pszFileName + conn->rootPathLen, pszFileName, iPos + 1 );
       memcpy( pszFileName, conn->rootPath, conn->rootPathLen );
    }
 
diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile
index 10f3c31e33..fb7ff6dcc7 100644
--- a/harbour/external/libpng/Makefile
+++ b/harbour/external/libpng/Makefile
@@ -34,6 +34,9 @@ HB_SUPPORTED := yes
 ifeq ($(HB_COMPILER),poccarm)
    HB_SUPPORTED := no
 endif
+ifeq ($(HB_COMPILER),xcc)
+   HB_SUPPORTED := no
+endif
 
 ifeq ($(HB_SUPPORTED),yes)