diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0b73c5a9f4..171d5798a0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-16 18:02 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.hbp
+  * utils/hbmk2/Makefile
+    % disabled embedded headers again, now dir layout detection should
+      work well even under GNU Make, so it's not necessary
+
 2012-06-16 17:59 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     ! ignore HB_INSTALL_* envvars too in runner mode
@@ -39,7 +45,7 @@
     ! fixed to ignore HB_INSTALL_PREFIX variable in runner mode.
       This points to invalid places while running as part of GNU
       Make and prevents autodetection.
-      TODO: Recheck if it now works without embedded headers.
+      TODO: Recheck if it now works without embedded headers. [DONE]
       TODO: Obsolete HB_INSTALL_PREFIX also in hbmk2 mode.
 
 2012-06-16 12:42 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile
index 5660e8fc2f..46a8c7b7a3 100644
--- a/harbour/utils/hbmk2/Makefile
+++ b/harbour/utils/hbmk2/Makefile
@@ -23,8 +23,6 @@ ifneq ($(HB_HAS_WATT),)
    HB_PRGFLAGS += -DHB_HAS_WATT
 endif
 
-HB_PRGFLAGS += -DHBMK_WITH_ALL_EMBEDDED_HEADERS
-
 ifneq ($(filter $(HB_PLATFORM),win wce os2),)
    ifneq ($(HB_BUILD_DYN),no)
       HB_BUILD_SHARED := yes
diff --git a/harbour/utils/hbmk2/hbmk2.hbp b/harbour/utils/hbmk2/hbmk2.hbp
index b4d81c5600..7658a64fc4 100644
--- a/harbour/utils/hbmk2/hbmk2.hbp
+++ b/harbour/utils/hbmk2/hbmk2.hbp
@@ -11,8 +11,6 @@
 
 -mt
 
--prgflag=-DHBMK_WITH_ALL_EMBEDDED_HEADERS
-
 hbmk2.prg
 
 -lhbpmcom{dos}