diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5ad9739bcc..bb5880286b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-07 23:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbnetio/utils/netiosrv.hbp
+    * Renamed netiosrv to hbnetio.
+    + Adding CPU type to hbnetio executable name if it's not x86.
+
 2009-10-07 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Enabled upx support on all *nix system.
diff --git a/harbour/contrib/hbnetio/utils/netiosrv.hbp b/harbour/contrib/hbnetio/utils/netiosrv.hbp
index 96f173740e..30977325d3 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv.hbp
+++ b/harbour/contrib/hbnetio/utils/netiosrv.hbp
@@ -3,5 +3,6 @@
 #
 
 netiosrv.prg
--o{!dos}netiosrv_${hb_plat}
--o{dos}netiodos
+-o{!dos&x86}hbnetio_${hb_plat}
+-o{!dos&!x86}hbnetio_${hb_plat}_${hb_cpu}
+-o{dos}hbnetio