diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3803eceeac..91bc25cf80 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-26 20:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + -xhp= converter switch now recognizes some more types of file.
+      (lib, object and libpaths)
+
+  * contrib/hbnetio/utils/netiosrv.prg
+  * contrib/hbnetio/utils/netiocmd.prg
+    - Deleted call protection.
+
 2010-01-26 20:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * harbour.spec
   * INSTALL
diff --git a/harbour/contrib/hbnetio/utils/netiocmd.prg b/harbour/contrib/hbnetio/utils/netiocmd.prg
index 3dc8e393a6..c5c6017120 100644
--- a/harbour/contrib/hbnetio/utils/netiocmd.prg
+++ b/harbour/contrib/hbnetio/utils/netiocmd.prg
@@ -14,24 +14,14 @@
  */
 
 FUNCTION hbnetiosrv_LoadCmds( bQuit, bShowInfo )
-   LOCAL hCmds
-
-   LOCAL cName
-
-   /* We add here a little validation to ensure that we can not be hacked. [vailtom] */
-   hb_FNameSplit( ProcFile( 1 ), NIL, @cName )
-   IF Lower( ProcName( 1 ) + "-" + cName ) != "main-netiosrv"
-      RETURN NIL
-   ENDIF
-
-   hCmds := { ;
-               "?"         => { "Synonym for 'help'."           , {|| cmdHelp( hCmds ) } },;
-               "clear"     => { "Clear screen."                 , {|| Scroll(), SetPos( 0, 0 ) } },;
-               "config"    => { "Show server configuration."    , bShowInfo },;
-               "sysinfo"   => { "Show system/build information.", {|| cmdSysInfo() } },;
-               "quit"      => { "Stop server and exit."         , bQuit },;
-               "help"      => { "Display this help."            , {|| cmdHelp( hCmds ) } };
-            }
+   LOCAL hCmds := { ;
+                     "?"         => { "Synonym for 'help'."           , {|| cmdHelp( hCmds ) } },;
+                     "clear"     => { "Clear screen."                 , {|| Scroll(), SetPos( 0, 0 ) } },;
+                     "config"    => { "Show server configuration."    , bShowInfo },;
+                     "sysinfo"   => { "Show system/build information.", {|| cmdSysInfo() } },;
+                     "quit"      => { "Stop server and exit."         , bQuit },;
+                     "help"      => { "Display this help."            , {|| cmdHelp( hCmds ) } };
+                  }
 
    RETURN hCmds
 
diff --git a/harbour/contrib/hbnetio/utils/netiosrv.prg b/harbour/contrib/hbnetio/utils/netiosrv.prg
index b042d2e1e6..0a0a097cac 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/netiosrv.prg
@@ -138,11 +138,6 @@ PROCEDURE Main( ... )
       hCommands  := hbnetiosrv_LoadCmds( {|| lQuit := .T. },;            /* codeblock to quit */
                                          {|| ShowConfig( netiosrv ) } )  /* codeblock to display config both uses local vars */
 
-      IF Empty( hCommands )
-         OutStd( "Internal error", hb_osNewLine() )
-         lQuit := .T.
-      ENDIF
-
       /* Command prompt */
       DO WHILE ! lQuit
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index f621ac58e1..86b40d46a4 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7972,11 +7972,14 @@ STATIC PROCEDURE convert_xhp_to_hbp( cSrcName, cDstName )
    LOCAL cSetting
    LOCAL cValue
    LOCAL aValue
+   LOCAL cFile
+
+   LOCAL hLIBPATH := {=>}
 
    LOCAL cMAIN := NIL
 
    LOCAL lFileSection := .F.
-
+#pragma linenumber=on
    hbmk_OutStd( hb_StrFormat( I_( "Loading xhp (xMate) project file: %1$s" ), cSrcName ) )
 
    IF Empty( cDstName )
@@ -7992,7 +7995,33 @@ STATIC PROCEDURE convert_xhp_to_hbp( cSrcName, cDstName )
       ELSEIF lFileSection
          tmp := At( "=", cLine )
          IF tmp > 0
-            AAdd( aDst, StrTran( AllTrim( Left( cLine, tmp - 1 ) ), "%HOME%\" ) )
+            cFile := AllTrim( Left( cLine, tmp - 1 ) )
+            SWITCH Lower( FN_ExtGet( cFile ) )
+            CASE ".c"
+            CASE ".prg"
+               IF !( "%HB_INSTALL%\" $ cFile )
+                  AAdd( aDst, StrTran( cFile, "%HOME%\" ) )
+               ENDIF
+               EXIT
+            CASE ".lib"
+            CASE ".a"
+               IF !( "%C_LIB_INSTALL%\" $ cFile ) .AND. ;
+                  !( "%HB_LIB_INSTALL%\" $ cFile )
+                  cFile := StrTran( cFile, "%HOME%\" )
+                  IF !( FN_DirGet( cFile ) $ hLIBPATH )
+                     hLIBPATH[ FN_DirGet( cFile ) ] := NIL
+                  ENDIF
+                  AAdd( aDst, "-l" + FN_NameGet( cFile ) )
+               ENDIF
+               EXIT
+            CASE ".obj"
+            CASE ".o"
+               IF !( "%C_LIB_INSTALL%\" $ cFile ) .AND. ;
+                  !( "%HB_LIB_INSTALL%\" $ cFile )
+                  AAdd( aDst, StrTran( cFile, "%HOME%\" ) )
+               ENDIF
+               EXIT
+            ENDSWITCH
          ENDIF
       ELSE
          tmp := At( "=", cLine )
@@ -8039,6 +8068,10 @@ STATIC PROCEDURE convert_xhp_to_hbp( cSrcName, cDstName )
       ENDIF
    NEXT
 
+   FOR EACH tmp IN hLIBPATH
+      AAdd( aDst, "-L" + tmp:__enumKey() )
+   NEXT
+
    cDst := ""
    FOR EACH tmp IN aDst
       cDst += tmp + hb_osNewLine()