diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4a90ac95a6..4cee4cf2c6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-23 01:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    + Added information about C/C++ mode defaults.
+
+  * contrib/xhb/xhberr.prg
+    + Some internal xhb functions added.
+      (from xhb repo)
+
 2009-06-23 00:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Deleted first empty string parameter passed to HB_COMPILE()
diff --git a/harbour/INSTALL b/harbour/INSTALL
index f366f6cd3a..e53981bc4b 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -252,6 +252,8 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
    - HB_BUILD_DEBUG=yes        Create a debug build.
    - HB_BUILD_OPTIM=no         Disable C compiler optimizations.
    - HB_BUILD_MODE=[cpp|c]     Changes default build mode to C++ or C.
+                               Default is C, except for msvc* and watcom
+                               compilers.
    - HB_CONTRIBLIBS=no         Don't build any contrib libraries.
    - HB_CONTRIBLIBS=[<list>]   Build space separated <list> of contrib
                                libraries. Build all if left empty.
diff --git a/harbour/contrib/xhb/xhberr.prg b/harbour/contrib/xhb/xhberr.prg
index ce22e940c7..c057289bd6 100644
--- a/harbour/contrib/xhb/xhberr.prg
+++ b/harbour/contrib/xhb/xhberr.prg
@@ -648,3 +648,35 @@ STATIC FUNCTION Arguments( oErr )
    ENDIF
 
    RETURN cArguments
+
+FUNCTION __BreakBlock()
+   RETURN {| e | Break( e ) }
+
+FUNCTION __ErrorBlock( )
+   RETURN {| e | __MinimalErrorHandler( e ) }
+
+PROCEDURE __MinimalErrorHandler( oError )
+
+   LOCAL cError := "Error!" + hb_osNewLine()
+
+   IF ValType( oError:Operation ) == 'C'
+      cError += "Operation: " + oError:Operation + hb_osNewLine()
+   ENDIF
+   IF ValType( oError:Description ) == 'C'
+      cError += "Description: " + oError:Description + hb_osNewLine()
+   ENDIF
+   IF ValType( oError:ModuleName ) == 'C'
+      cError += "Source: " + oError:ModuleName + hb_osNewLine()
+   ENDIF
+   IF ValType( oError:ProcName ) == 'C'
+      cError += "Procedure: " + oError:ProcName + hb_osNewLine()
+   ENDIF
+   IF ValType( oError:ProcLine ) == 'N'
+      cError += "Line: " + hb_ntos( oError:ProcLine ) + hb_osNewLine()
+   ENDIF
+
+   OutStd( cError )
+
+   QUIT
+
+   RETURN