diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1cd4227ad6..5acf61bbbf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-05 22:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+    ! Fixed recent regression: build hbx only for hblib/hbdyn projects.
+
+  * contrib/hbrunext/pullext.prg
+  * contrib/hbrunext/hbrunext.hbp
+    * Internal rename.
+
+  * contrib/hbwin/hbwin.hbx
+  * contrib/hbmemio/hbmemio.hbx
+  * contrib/hbct/hbct.hbx
+    * Refreshed. (comment only)
+
 2011-02-05 22:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/3rd/zlib/Makefile
     ! Fixed to export symbols with bcc.
diff --git a/harbour/contrib/hbct/hbct.hbx b/harbour/contrib/hbct/hbct.hbx
index 73b04417cf..841961fd25 100644
--- a/harbour/contrib/hbct/hbct.hbx
+++ b/harbour/contrib/hbct/hbct.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__HBCT__
diff --git a/harbour/contrib/hbmemio/hbmemio.hbx b/harbour/contrib/hbmemio/hbmemio.hbx
index 91403579d2..b3d8c9a67c 100644
--- a/harbour/contrib/hbmemio/hbmemio.hbx
+++ b/harbour/contrib/hbmemio/hbmemio.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__HBMEMIO__
diff --git a/harbour/contrib/hbrunext/hbrunext.hbp b/harbour/contrib/hbrunext/hbrunext.hbp
index 06ecd72df5..47369e6913 100644
--- a/harbour/contrib/hbrunext/hbrunext.hbp
+++ b/harbour/contrib/hbrunext/hbrunext.hbp
@@ -8,7 +8,7 @@
 
 -o${hb_name}
 
--request=__PULLEXT
+-request=__HBRUN__PULLEXT
 pullext.prg
 
 # Always build in shared mode for these platforms because the
diff --git a/harbour/contrib/hbrunext/pullext.prg b/harbour/contrib/hbrunext/pullext.prg
index 2e0056f438..64826955d0 100644
--- a/harbour/contrib/hbrunext/pullext.prg
+++ b/harbour/contrib/hbrunext/pullext.prg
@@ -50,7 +50,7 @@
  *
  */
 
-ANNOUNCE __PULLEXT
+ANNOUNCE __HBRUN__PULLEXT
 
 REQUEST __HBEXTERN__HBCT__
 REQUEST __HBEXTERN__HBEXPAT__
diff --git a/harbour/contrib/hbwin/hbwin.hbx b/harbour/contrib/hbwin/hbwin.hbx
index 5602eb5d64..bda86640cc 100644
--- a/harbour/contrib/hbwin/hbwin.hbx
+++ b/harbour/contrib/hbwin/hbwin.hbx
@@ -13,8 +13,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__HBWIN__
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 5c8ef3ceee..8c826f66be 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -431,7 +431,9 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption
          lContainer := "lFromContainer" $ hProjectList[ cProject ]
 
          IF ( nErrorLevel := call_hbmk2( cProjectPath, iif( lPrimary .OR. lContainer, iif( lContainer, cOptions, cOptions + cOptionsUser ), " -inc" ) +;
-                                                       iif( GetEnv( "HB_REBUILD_EXTERN" ) == "yes" .AND. ( lPrimary .OR. lContainer ), " -hbx=" + FNameExtSet( cProjectPath, ".hbx" ), "" ), NIL ) ) == 0
+                                                       iif( hProjectList[ cProject ][ "cType" ] $ "hblib|hbdyn" .AND. ;
+                                                            GetEnv( "HB_REBUILD_EXTERN" ) == "yes" .AND. ;
+                                                            ( lPrimary .OR. lContainer ), " -hbx=" + FNameExtSet( cProjectPath, ".hbx" ), "" ), NIL ) ) == 0
 
             /* Build dynamic lib */
             IF GetEnv( "HB_BUILD_CONTRIB_DYN" ) == "yes" .AND. hProjectList[ cProject ][ "cType" ] == "hblib"