diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 21660fd57b..ec65209815 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-08 08:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Extension is also omitted when Harbour is installed
+      on sys loc.
+
 2009-04-08 03:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Possible fix for *nix shared lib problem when Harbour
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 383392c502..6e1865a4ae 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1228,10 +1228,12 @@ PROCEDURE Main( ... )
       DO CASE
       CASE t_cARCH $ "bsd|linux|hpux|sunos" .OR. t_cARCH == "darwin" /* Separated to avoid match with 'win' */
          IF Empty( cPrefix )
-            cDynLibNamePrefix := ""
+            s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cPostfix,;
+                                          "harbour"   + cPostfix ) }
+         ELSE
+            s_aLIBSHARED := { iif( s_lMT, cPrefix + cDynLibNamePrefix + "harbourmt" + cPostfix + cDynLibExt,;
+                                          cPrefix + cDynLibNamePrefix + "harbour"   + cPostfix + cDynLibExt ) }
          ENDIF
-         s_aLIBSHARED := { iif( s_lMT, cPrefix + cDynLibNamePrefix + "harbourmt" + cPostfix + cDynLibExt,;
-                                       cPrefix + cDynLibNamePrefix + "harbour"   + cPostfix + cDynLibExt ) }
       CASE t_cARCH $ "os2|win|wce"
          s_aLIBSHARED := { iif( s_lMT, cDynLibNamePrefix + "harbourmt",;
                                        cDynLibNamePrefix + "harbour" ) }