diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3ec8cd0f4f..01477f4e96 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-02 20:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbide/hbide.prg
+    ! Don't add binary extensions to target names.
+      It will be added by hbmk2 automatically and properly
+      according to target platform/compiler.
+    ! Don't add .exe extension to hbmk2 executable name.
+
 2010-01-02 20:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * harbour.spec
     ! Modified this line:
diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg
index 1e9885d5b7..781db35749 100644
--- a/harbour/contrib/hbide/hbide.prg
+++ b/harbour/contrib/hbide/hbide.prg
@@ -1622,7 +1622,7 @@ METHOD HbIde:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
    DEFAULT lLaunch   TO .F.
    DEFAULT lRebuild  TO .F.
    DEFAULT lPPO      TO .F.
-   DEFAULT lViaQt    TO .f.
+   DEFAULT lViaQt    TO .F.
 
    lDelHbp := lPPO
 
@@ -1658,17 +1658,10 @@ METHOD HbIde:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
    End
 
    DO CASE
-   CASE aPrj[ PRJ_PRP_PROPERTIES, 2, E_qPrjType ] == "Executable"
-      cTargetFN += '.exe'
-
    CASE aPrj[ PRJ_PRP_PROPERTIES, 2, E_qPrjType ] == "Lib"
-      cTargetFN += '.lib'
       aadd( aHbp, "-hblib" )
-
    CASE aPrj[ PRJ_PRP_PROPERTIES, 2, E_qPrjType ] == "Dll"
-      cTargetFN += '.dll'
       aadd( aHbp, "-hbdyn" )
-
    ENDCASE
 
    aadd( aHbp, "-o" + cTargetFN )
@@ -1732,7 +1725,7 @@ METHOD HbIde:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
          Qt_Connect_Signal( ::qProcess, "finished(int,int)"        , {|o,i| ::readProcessInfo( 4, i, o ) } )
 
          ::oOutputResult:oWidget:clear()
-         ::qProcess:start( "hbmk2.exe", qStringList )
+         ::qProcess:start( "hbmk2", qStringList )
 
       ELSE
          cTmp := "Project: " + cProject + CRLF + ;
@@ -1743,11 +1736,11 @@ METHOD HbIde:buildProject( cProject, lLaunch, lRebuild, lPPO, lViaQt )
                  '-----------------------------------------------------------------' + CRLF
 
          cOutput := "" ; cErrors := ""
-         nResult := hb_processRun( ( "hbmk2.exe " + cHbpPath ), , @cOutput, @cErrors )
+         nResult := hb_processRun( ( "hbmk2 " + cHbpPath ), , @cOutput, @cErrors )
 
        * Show detailed status about compile process...
          cTmp += cOutput + CRLF
-         cTmp += IF( empty( cErrors ), "", cErrors ) + CRLF
+         cTmp += IIF( empty( cErrors ), "", cErrors ) + CRLF
          cTmp += "errorlevel: " + hb_ntos( nResult ) + CRLF
          cTmp += '-----------------------------------------------------------------' + CRLF
          cTmp += 'Finished at ' + time() + CRLF