diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ce7e5c3ae0..7b4631f4f7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-08 11:05 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * ChangeLog
+  * contrib/hbnetio/utils/hbnetio/netiosrv.prg
+    ! Set netio root data dir to 'data' subdir by default to
+      avoid overwriting anything in the daemon's own
+      directory (f.e. its settings)
+    ! Set netio root data dir to invalid dir name ("*?:*?:")
+      to prevent management clients to create any files
+      on server. QUESTION: Is there a better way to prevent
+      RDD I/O redirection for given server session?
+
 2011-02-08 09:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/gtwvt/gtwvt.c
     * redefine [GS]etWindowLongPtr() -> [GS]etWindowLong() in one place only
@@ -23,7 +34,7 @@
 
 2011-02-07 17:09 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbnetio/utils/hbnetioq/netiosrq.prg
-    ! Enabled: "Stop" a connection, either via toolbar icon or 
+    ! Enabled: "Stop" a connection, either via toolbar icon or
       context menu on a connection row in the browser.
     % Fixed: to refresh browser every 3 seconds.
 
@@ -405,7 +416,7 @@
     - Deleted WIN_HIWORD()
     ; INCOMPATIBILITY: If you used WIN_RECTANGLE() or WIN_SETBKMODE()
                        specifically from GTWVW, change these calls to
-                       the neww WVW_*() versions.
+                       the new WVW_*() versions.
                        If you used WIN_LOWORD() or WIN_HIWORD(),
                        link hbwin lib (hbwin.hbc) to your app.
 
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
index b13c120140..b198340bb6 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
@@ -98,7 +98,7 @@ PROCEDURE Main( ... )
 
    LOCAL lUI := .T.
 
-   Set( _SET_DATEFORMAT, "yyyy.mm.dd"   )
+   Set( _SET_DATEFORMAT, "yyyy.mm.dd" )
    Set( _SET_TIMEFORMAT, "HH:MM:SS.FFF" )
 
    HB_Logo()
@@ -106,7 +106,7 @@ PROCEDURE Main( ... )
    netiosrv[ _NETIOSRV_cName ]          := "Data"
    netiosrv[ _NETIOSRV_nPort ]          := _NETIOSRV_PORT_DEF
    netiosrv[ _NETIOSRV_cIFAddr ]        := _NETIOSRV_IPV4_DEF
-   netiosrv[ _NETIOSRV_cRootDir ]       := hb_dirBase()
+   netiosrv[ _NETIOSRV_cRootDir ]       := hb_dirBase() + "data"
    netiosrv[ _NETIOSRV_lRPC ]           := .F.
    netiosrv[ _NETIOSRV_lEncryption ]    := .F.
    netiosrv[ _NETIOSRV_lAcceptConn ]    := .T.
@@ -125,6 +125,7 @@ PROCEDURE Main( ... )
    netiomgm[ _NETIOSRV_cName ]          := "Management"
    netiomgm[ _NETIOSRV_nPort ]          := _NETIOMGM_PORT_DEF
    netiomgm[ _NETIOSRV_cIFAddr ]        := _NETIOMGM_IPV4_DEF
+   netiomgm[ _NETIOSRV_cRootDir ]       := "*?:*?:" /* Invalid name */
    netiomgm[ _NETIOSRV_lAcceptConn ]    := .T.
    netiomgm[ _NETIOSRV_lShowConn ]      := .F.
    netiomgm[ _NETIOSRV_hConnection ]    := { => }
@@ -206,6 +207,8 @@ PROCEDURE Main( ... )
       netiosrv_LogEvent( hb_StrFormat( "Configuration loaded: %1$s", netiosrv_ConfName() ) )
    ENDIF
 
+   hb_dirBuild( netiosrv[ _NETIOSRV_cRootDir ] )
+
    netiosrv[ _NETIOSRV_pListenSocket ] := ;
       netio_mtserver( netiosrv[ _NETIOSRV_nPort ],;
                       netiosrv[ _NETIOSRV_cIFAddr ],;
@@ -229,7 +232,7 @@ PROCEDURE Main( ... )
          netiomgm[ _NETIOSRV_pListenSocket ] := ;
             netio_mtserver( netiomgm[ _NETIOSRV_nPort ],;
                             netiomgm[ _NETIOSRV_cIFAddr ],;
-                            NIL,;
+                            netiomgm[ _NETIOSRV_cRootDir ],;
                             { "hbnetiomgm_ping"           => {| ... | .T. } ,;
                               "hbnetiomgm_setclientinfo"  => {| ... | netiomgm_rpc_setclientinfo( netiomgm, ... ) } ,;
                               "hbnetiomgm_sysinfo"        => {| ... | netiomgm_rpc_sysinfo() } ,;