diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 294a1e4a07..447e89b027 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-05 16:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbbz2/hbbz2.hbp
+    ! Fix to prev.
+
+  * contrib/hbbz2/hbbz2.hbx
+  * contrib/hbxpp/hbxpp.hbx
+    * Updated.
+
 2011-02-05 16:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/make.hbs
     + Updated to use hbmk2 to create hbx files.
diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/harbour/contrib/hbbz2/hbbz2.hbp
index fe0604127d..692e6086c3 100644
--- a/harbour/contrib/hbbz2/hbbz2.hbp
+++ b/harbour/contrib/hbbz2/hbbz2.hbp
@@ -23,6 +23,6 @@
 
 hbbz2.hbx
 
-hbbz2.c
+core.c
 
 3rd/bz2/bz2.hbc{HBMK_HAS_BZIP2_LOCAL}
diff --git a/harbour/contrib/hbbz2/hbbz2.hbx b/harbour/contrib/hbbz2/hbbz2.hbx
index 64cb14906e..920da81dca 100644
--- a/harbour/contrib/hbbz2/hbbz2.hbx
+++ b/harbour/contrib/hbbz2/hbbz2.hbx
@@ -11,18 +11,17 @@
 
 /* -------------------------------------------------------------------- */
 /* WARNING: Automatically generated code below. DO NOT EDIT!            */
-/*          Regenerate with HB_REBUILD_EXTERN=yes while using GCC       */
-/*          compiler family. [vszakats]                                 */
+/*          Regenerate using hbmk2 '-hbx=' option.                      */
 /* -------------------------------------------------------------------- */
 
 #ifndef __HBEXTERN_CH__HBBZ2__
 #define __HBEXTERN_CH__HBBZ2__
 
-#ifdef __HBEXTERN__HBBZ2__ANNOUNCE
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBBZ2__ANNOUNCE )
    ANNOUNCE __HBEXTERN__HBBZ2__
 #endif
 
-#ifdef __HBEXTERN__HBBZ2__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBBZ2__REQUEST )
    #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif
 
@@ -32,7 +31,7 @@ DYNAMIC HB_BZ2_UNCOMPRESS
 DYNAMIC HB_BZ2_UNCOMPRESSLEN
 DYNAMIC HB_BZ2_VERSION
 
-#ifdef __HBEXTERN__HBBZ2__REQUEST
+#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__HBBZ2__REQUEST )
    #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif
 
diff --git a/harbour/contrib/hbxpp/hbxpp.hbx b/harbour/contrib/hbxpp/hbxpp.hbx
index e299cea59e..f192e6a6a0 100644
--- a/harbour/contrib/hbxpp/hbxpp.hbx
+++ b/harbour/contrib/hbxpp/hbxpp.hbx
@@ -11,8 +11,7 @@
 
 /* -------------------------------------------------------------------- */
 /* WARNING: Automatically generated code below. DO NOT EDIT!            */
-/*          Regenerate with HB_REBUILD_EXTERN=yes while using GCC       */
-/*          compiler family. [vszakats]                                 */
+/*          Regenerate using hbmk2 '-hbx=' option.                      */
 /* -------------------------------------------------------------------- */
 
 #ifndef __HBEXTERN_CH__HBXPP__