diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 35ec05c58c..c8648c5790 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,32 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-25 10:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbplist
+  - contrib/hbnetio/utils/netiosrv/hbnetio.hbp
+  + contrib/hbnetio/utils/netiosrv/netiosrv.hbp
+    * Renamed.
+
+  * contrib/hbnetio/netiosrv.c
+    ! Fixed build-stopper typo in this modification:
+         2011-01-25 12:41 UTC-0800 Pritpal Bedi
+      I'd like to ask developers to _at least_ do _build test_
+      before committing to SVN !!!
+      Obviously this wasn't done for the above commit.
+
+  - contrib/hbnetio/utils/netiosrq/netiosrvq.prg
+  + contrib/hbnetio/utils/netiosrq/netiosrq.prg
+  - contrib/hbnetio/utils/netiosrq/netiosrvqt.hbp
+  + contrib/hbnetio/utils/netiosrq/netiosrq.hbp
+  - contrib/hbnetio/utils/netiosrq/netiosrvq.qrc
+  + contrib/hbnetio/utils/netiosrq/netiosrq.qrc
+  - contrib/hbnetio/utils/netiosrq/harbour.ico
+    ! Fixed inconsistent names.
+    - Deleted Windows specific icon file.
+    ! Fixed long filenames.
+    + Added icon for OS/2.
+    ; TOFIX: Build doesn't work due to missing external (CONFIRMBOX).
+
 2011-01-25 10:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbunix/daemon.c
     ! Fixed gcc warning. Patch by Tamas.
diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c
index fb2ba26ddd..b6222490f7 100644
--- a/harbour/contrib/hbnetio/netiosrv.c
+++ b/harbour/contrib/hbnetio/netiosrv.c
@@ -1395,5 +1395,5 @@ HB_FUNC( NETIO_SRVOPENFILESCOUNT )
    if( conn )
       hb_retni( conn->filesCount );
    else
-      hb_retni( 0 )
+      hb_retni( 0 );
 }
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/harbour.ico b/harbour/contrib/hbnetio/utils/netiosrq/harbour.ico
deleted file mode 100644
index f92a768e65..0000000000
Binary files a/harbour/contrib/hbnetio/utils/netiosrq/harbour.ico and /dev/null differ
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/netiosrvqt.hbp b/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.hbp
similarity index 84%
rename from harbour/contrib/hbnetio/utils/netiosrq/netiosrvqt.hbp
rename to harbour/contrib/hbnetio/utils/netiosrq/netiosrq.hbp
index 51b7793939..e4c0c1fb14 100644
--- a/harbour/contrib/hbnetio/utils/netiosrq/netiosrvqt.hbp
+++ b/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.hbp
@@ -9,6 +9,7 @@
 -o${hb_name}
 
 -icon={allwin}../../../package/harb_win.ico
+-icon={os2}../../package/harb_os2.ico
 
 ../../../hbqt/hbqtuitools.hbc
 ../../../hbxbp/hbxbp.hbc
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/netiosrvq.prg b/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.prg
similarity index 99%
rename from harbour/contrib/hbnetio/utils/netiosrq/netiosrvq.prg
rename to harbour/contrib/hbnetio/utils/netiosrq/netiosrq.prg
index bee5346c77..5b0af0316d 100644
--- a/harbour/contrib/hbnetio/utils/netiosrq/netiosrvq.prg
+++ b/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.prg
@@ -225,7 +225,7 @@ METHOD NetIOServer:create( netiosrv )
       MsgBox( "Cannot start server." )
 
    ELSE
-      QResource():registerResource_1( hbqtres_netiosrvq(), ":/resource" )
+      QResource():registerResource_1( hbqtres_netiosrq(), ":/resource" )
 
       ::pMtx            := hb_mutexCreate()
       ::cTitle          := "NetIO Server [ " + netiosrv[ _NETIOSRV_cIFAddr ] + " : " + ;
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/netiosrvq.qrc b/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.qrc
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/netiosrvq.qrc
rename to harbour/contrib/hbnetio/utils/netiosrq/netiosrq.qrc
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/hbnetio.hbp b/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/hbnetio.hbp
rename to harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index fa4f8deb76..d4d446750e 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -33,7 +33,7 @@ hbmxml/hbmxml.hbp                # uses: minixml (locally hosted)
 hbmysql/hbmysql.hbp
 hbmzip/hbmzip.hbp                # uses: minizip (locally hosted)
 hbnetio/hbnetio.hbp
-hbnetio/utils/netiosrv/hbnetio.hbp
+hbnetio/utils/netiosrv/netiosrv.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp