diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7c288a4bff..56ef8e7d6b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-11 20:59 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    ! fixed handling of -ku:<cp> option. Now hbmk2 will pass
+      -ku to Harbour compiler, which seems to help, but I
+      still can't see any effect of the <cp> passed, so still
+      unsure if this is the way to go.
+      See original commit here: 2012-04-23 20:31 UTC+0200
+
 2012-10-11 20:47 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/src/rtl/gtwvt/gtwvt.h
   * harbour/src/rtl/gtwvt/gtwvt.c
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index a4ef4c43dc..e676b6ce2d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2742,6 +2742,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                      ENDIF
                   ENDIF
                ENDSWITCH
+               IF ! Empty( hbmk[ _HBMK_cCPPRG ] )
+                  AAddNew( hbmk[ _HBMK_aOPTPRG ], "-ku" )
+               ENDIF
             ENDIF
          ELSE
             IF hbmk[ _HBMK_lInfo ]