diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 015f1f3779..2a8b6f3bdb 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-18 15:29 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    ! weird editing typo in a recent HB_STRREPLACE() related
+      commit, causing messed custom linker options
+
 2013-02-18 14:48 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.*.po
   * utils/hbmk2/hbmk2.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 4925f5dbc8..d7085252ca 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6809,7 +6809,7 @@ FUNCTION hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExitStr )
                nOpt_FNF := iif( "{SCRIPT}" $ cOpt_Link, hbmk[ _HBMK_nScr_FNF ], hbmk[ _HBMK_nCmd_FNF ] )
 
                /* TODO: eliminate recursive macros from hbmk[ _HBMK_aOPTL ] */
-               cOpt_Link := StrTran( cOpt_Link, "{FL}", hb_Version( HB_VERSION_FLAG_LINKER ) + " ", "" ) +;
+               cOpt_Link := StrTran( cOpt_Link, "{FL}", iif( hbmk[ _HBMK_lBLDFLGL ], hb_Version( HB_VERSION_FLAG_LINKER ) + " ", "" ) +;
                                                         GetEnv( "HB_USER_LDFLAGS" ) +;
                                                         iif( Empty( hbmk[ _HBMK_aOPTL ] ), "", " " + ArrayToList( hbmk[ _HBMK_aOPTL ] ) )