diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f5ae5a5211..a8cded7560 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-10 15:48 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    * -debug description extended.
+
+  * contrib/xhb/hbcompat.ch
+    - Disabled dangerous bitop compatibility macros + comment added.
+      Enabled them with #define XHB_BITOP. Or even better 
+      to change code to use HB_BIT*() functions natively.
+
 2009-03-10 12:23 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/garbage.c
     ! fixed one bad typo
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index d8d8af6108..f73a187578 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -306,9 +306,16 @@
    #translate ( <exp1> LIKE <exp2> )   => ( HB_REGEXLIKE( (<exp2>), (<exp1>) ) )
    #translate ( <exp1> \<\< <exp2> )   => ( HB_BITSHIFT( (<exp1>), (<exp2>) ) )
    #translate ( <exp1> >> <exp2> )     => ( HB_BITSHIFT( (<exp1>), -(<exp2>) ) )
-   #translate ( <exp1> | <exp2> )      => ( HB_BITOR( (<exp1>), (<exp2>) ) )
-   #translate ( <exp1> & <exp2> )      => ( HB_BITAND( (<exp1>), (<exp2>) ) )
-   #translate ( <exp1> ^^ <exp2> )     => ( HB_BITXOR( (<exp1>), (<exp2>) ) )
+   /* NOTE: These macros can break some valid Harbour/Clipper constructs, 
+            so they are disabled by default. Enable them with care, or  
+            even better to switch to use HB_BIT*() functions directly. 
+            They are optimized by Harbour compiler the same way (and even 
+            more) as these C-like operators, without any bad side-effects. */
+   #if defined( XHB_BITOP )
+      #translate ( <exp1> | <exp2> )      => ( HB_BITOR( (<exp1>), (<exp2>) ) )
+      #translate ( <exp1> & <exp2> )      => ( HB_BITAND( (<exp1>), (<exp2>) ) )
+      #translate ( <exp1> ^^ <exp2> )     => ( HB_BITXOR( (<exp1>), (<exp2>) ) )
+   #endif
 
 #endif
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index cde1d1a8f7..3c50c70638 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2965,7 +2965,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  -main=<mainfunc>  override the name of starting function/procedure" ,;
       "  -fullstatic       link with all static libs" ,;
       "  -nulrdd[-]        link with nulrdd" ,;
-      "  -[no]debug        add/exclude debug info" ,;
+      "  -[no]debug        add/exclude C compiler debug info" ,;
       "  -[no]map          create (or not) a map file" ,;
       "  -[no]strip        strip (no strip) binaries" ,;
       "  -[no]fmstat       enable/disable runtime memory statistics (gcc builds only)" ,;