diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b65b6d165d..77cac2fdc1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-05 10:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Add -D__HBEXTREQ__ whenever an .hbx module is present in a project.
+
+  * contrib/hbpost.hbm
+    - Delete manual -D__HBEXTREQ__. Now automatic.
+
 2011-02-05 10:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   - contrib/hbct/ctextern.prg
   * contrib/hbct/hbct.hbp
@@ -46,7 +53,7 @@
             so .hbx cannot be directly included ATM.
     ; TODO: Move -D__HBEXTREQ__ to local .hbp files so they kick in in stdalone mode too.
             Or maybe hbmk2 should always define it, if there is an .hbx file included
-            in a project, after all it can generate these .hbx files, too.
+            in a project, after all it can generate these .hbx files, too. [DONE]
 
   * contrib/hbmxml/hbmxmlx.prg
   * contrib/hblzf/hblzfx.prg
diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm
index 5cdcff59ae..31e591fb5c 100644
--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -11,7 +11,6 @@
 -prgflag=-es2
 -prgflag=-kmo
 -prgflag=-i-
--prgflag=-D__HBEXTREQ__
 
 # It is also supported by official mingw 4.4.x and mingw64 4.4.x,
 # but not supported by mingw tdm 4.4.x, so I only enable it on or
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index eb70e4ed84..fcf27ba696 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2894,6 +2894,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          cParam := PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] )
          IF Empty( FNameExtGet( cParam ) )
             cParam := FNameExtSet( cParam, ".prg" )
+         ELSEIF FNameExtGet( cParamL ) == ".hbx"
+            AAddNew( hbmk[ _HBMK_aOPTPRG ], "-D__HBEXTREQ__" )
          ENDIF
          AAdd( hbmk[ _HBMK_aPRG ], cParam )
          DEFAULT hbmk[ _HBMK_cFIRST ] TO cParam