diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d8169c8d77..2f46b532e3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-07 16:55 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Regression fixed after latest poccarm support additions.
+
 2009-04-07 16:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * bin/postinst.bat
     ! Fixed shared executable creation for cross-builds.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b0bb5b9967..71e2c643dc 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1922,7 +1922,7 @@ PROCEDURE Main( ... )
             AAdd( s_aOPTC, "/Tx86-coff" )
          CASE t_cCOMP == "pocc64"
             AAdd( s_aOPTC, "/Tamd64-coff" )
-         CASE t_cCOMP $ "poccce|poccarm"
+         CASE t_cCOMP == "poccce" .OR. t_cCOMP == "poccarm"
             AAdd( s_aOPTC, "/Tarm-coff" )
          ENDCASE
          cOpt_Res := "{LR}"
@@ -1960,7 +1960,7 @@ PROCEDURE Main( ... )
          CASE t_cCOMP == "pocc64"
             s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64" + cLibExt,;
                                           "harbour-" + cDL_Version_Alter + "-x64" + cLibExt ) }
-         CASE t_cCOMP $ "poccce|poccarm"
+         CASE t_cCOMP == "poccce" .OR. t_cCOMP == "poccarm"
             s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm" + cLibExt,;
                                           "harbour-" + cDL_Version_Alter + "-arm" + cLibExt ) }
          OTHERWISE