diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b56c06bf0a..6fd0220c50 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-05 13:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbbz2/hbbz2.hbp
+  + contrib/hbbz2/hbbz2.hbx
+  - contrib/hbbz2/hbbz2.c
+  + contrib/hbbz2/core.c
+    * Renamed sources.
+    + Added .hbx file.
+    ; NOTE: BTW I'm not sure it's very good to name all main .c files
+            in wrapper libs as 'core.c', so if anyone have better idea,
+            pls shout.
+
 2011-02-05 12:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbmxml/hbmxml.hbp
   - contrib/hbmxml/hbmxml.c
diff --git a/harbour/contrib/hbbz2/hbbz2.c b/harbour/contrib/hbbz2/core.c
similarity index 100%
rename from harbour/contrib/hbbz2/hbbz2.c
rename to harbour/contrib/hbbz2/core.c
diff --git a/harbour/contrib/hbbz2/hbbz2.hbp b/harbour/contrib/hbbz2/hbbz2.hbp
index 664dafc099..fe0604127d 100644
--- a/harbour/contrib/hbbz2/hbbz2.hbp
+++ b/harbour/contrib/hbbz2/hbbz2.hbp
@@ -19,6 +19,9 @@
 -depfinish=bzip2
 
 -instfile=inc:hbbz2.ch
+-instfile=inc:hbbz2.hbx
+
+hbbz2.hbx
 
 hbbz2.c
 
diff --git a/harbour/contrib/hbbz2/hbbz2.hbx b/harbour/contrib/hbbz2/hbbz2.hbx
new file mode 100644
index 0000000000..64cb14906e
--- /dev/null
+++ b/harbour/contrib/hbbz2/hbbz2.hbx
@@ -0,0 +1,39 @@
+/*
+ * $Id$
+ */
+
+/* -------------------------------------------------------------------- */
+/* NOTE: You can add manual override which functions to include or      */
+/*       exclude from automatically generated EXTERNAL/DYNAMIC list.    */
+/*          Syntax: // HB_FUNC_INCLUDE <func>                           */
+/*                  // HB_FUNC_EXCLUDE <func>                           */
+/* -------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------- */
+/* WARNING: Automatically generated code below. DO NOT EDIT!            */
+/*          Regenerate with HB_REBUILD_EXTERN=yes while using GCC       */
+/*          compiler family. [vszakats]                                 */
+/* -------------------------------------------------------------------- */
+
+#ifndef __HBEXTERN_CH__HBBZ2__
+#define __HBEXTERN_CH__HBBZ2__
+
+#ifdef __HBEXTERN__HBBZ2__ANNOUNCE
+   ANNOUNCE __HBEXTERN__HBBZ2__
+#endif
+
+#ifdef __HBEXTERN__HBBZ2__REQUEST
+   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+DYNAMIC HB_BZ2_COMPRESS
+DYNAMIC HB_BZ2_COMPRESSBOUND
+DYNAMIC HB_BZ2_UNCOMPRESS
+DYNAMIC HB_BZ2_UNCOMPRESSLEN
+DYNAMIC HB_BZ2_VERSION
+
+#ifdef __HBEXTERN__HBBZ2__REQUEST
+   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
+#endif
+
+#endif