diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5fd0ce3134..70828dfcb6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,30 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-15 01:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * source/debug/dbgtobj.prg
+  * source/debug/dbgbrwsr.prg
+  * source/debug/dbgtwin.prg
+  * source/debug/dbgmenu.prg
+  * source/debug/dbgthsh.prg
+  * source/debug/tbrwtext.prg
+  * source/debug/dbgwa.prg
+  * source/debug/debugger.prg
+  * source/debug/dbghelp.prg
+  * source/debug/dbgtarr.prg
+  * source/debug/dbgtmenu.prg
+  * source/debug/dbgtmitm.prg
+    - Removed '#pragma DEBUGINFO=OFF'. See solution below.
+
+  * make_b32.mak
+  * make_gcc.mak
+  * make_vc.mak
+    * Forcing -b- (disabling debug info) for all core 
+      .prg functions. Compiling anything in core with 
+      -b would cause infinite loops, when trying to use 
+      the debugger.
+      QUESTION: Is HB_NO_READDBG still needed?
+
 2008-10-15 01:40 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   - lib/b32
   - lib/vc
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index ea2bee5538..ce5d2c2ca5 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -110,9 +110,9 @@ CEXEFLAGSDLL   = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS)
 #**********************************************************
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) -b-
 !if "$(HB_BUILD_DEBUG)" == "yes"
-HBFLAGSCMN     = $(HBFLAGSCMN) -b -l-
+HBFLAGSCMN     = $(HBFLAGSCMN) -l-
 !endif
 HARBOURFLAGS   = -n $(HBFLAGSCMN)
 HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN)
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index 69899a00c9..dadbdc1a3c 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -176,9 +176,9 @@ endif
 # Harbour Compiler Flags
 #**********************************************************
 
-HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
+HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) -b-
 ifeq ($(HB_BUILD_DEBUG),yes)
-HBFLAGSCMN     := $(HBFLAGSCMN) -b -l-
+HBFLAGSCMN     := $(HBFLAGSCMN) -l-
 endif
 HARBOURFLAGS   := -n $(HBFLAGSCMN)
 HARBOURFLAGSDLL:= -n1 $(HBFLAGSCMN)
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 460ca0a23d..6df04a8269 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -163,9 +163,9 @@ CEXEFLAGSDLL   = -MT$(DBGMARKER) $(CLIBFLAGS)
 #**********************************************************
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR) -b-
 !if "$(HB_BUILD_DEBUG)" == "yes"
-HBFLAGSCMN     = $(HBFLAGSCMN) -b -l-
+HBFLAGSCMN     = $(HBFLAGSCMN) -l-
 !endif
 !if "$(HB_BUILD_WINCE)" == "yes"
 HBFLAGSCMN     = $(HBFLAGSCMN) -D__PLATFORM__WINCE
diff --git a/harbour/source/debug/dbgbrwsr.prg b/harbour/source/debug/dbgbrwsr.prg
index 7dfb64600d..2c4d213e26 100644
--- a/harbour/source/debug/dbgbrwsr.prg
+++ b/harbour/source/debug/dbgbrwsr.prg
@@ -52,8 +52,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 /* HBDbBrowser
diff --git a/harbour/source/debug/dbghelp.prg b/harbour/source/debug/dbghelp.prg
index ce4e92fb45..caf7067f3f 100644
--- a/harbour/source/debug/dbghelp.prg
+++ b/harbour/source/debug/dbghelp.prg
@@ -59,8 +59,6 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
-#pragma DEBUGINFO=OFF
-
 #include "common.ch"
 #include "inkey.ch"
 
diff --git a/harbour/source/debug/dbgmenu.prg b/harbour/source/debug/dbgmenu.prg
index 3c3652f6da..56068ab21e 100644
--- a/harbour/source/debug/dbgmenu.prg
+++ b/harbour/source/debug/dbgmenu.prg
@@ -50,8 +50,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 #xcommand MENU [<oMenu>] => [ <oMenu> := ] HBDbMenu():New()
diff --git a/harbour/source/debug/dbgtarr.prg b/harbour/source/debug/dbgtarr.prg
index ea3c99d49f..f4c6aaa353 100644
--- a/harbour/source/debug/dbgtarr.prg
+++ b/harbour/source/debug/dbgtarr.prg
@@ -50,8 +50,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgthsh.prg b/harbour/source/debug/dbgthsh.prg
index 274144a709..787963bad9 100644
--- a/harbour/source/debug/dbgthsh.prg
+++ b/harbour/source/debug/dbgthsh.prg
@@ -51,8 +51,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgtmenu.prg b/harbour/source/debug/dbgtmenu.prg
index f6dfe60abd..174f5f9ead 100644
--- a/harbour/source/debug/dbgtmenu.prg
+++ b/harbour/source/debug/dbgtmenu.prg
@@ -54,8 +54,6 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 
diff --git a/harbour/source/debug/dbgtmitm.prg b/harbour/source/debug/dbgtmitm.prg
index 438c111454..e4d7a4242b 100644
--- a/harbour/source/debug/dbgtmitm.prg
+++ b/harbour/source/debug/dbgtmitm.prg
@@ -54,8 +54,6 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgtobj.prg b/harbour/source/debug/dbgtobj.prg
index f0b35e3524..b988436413 100644
--- a/harbour/source/debug/dbgtobj.prg
+++ b/harbour/source/debug/dbgtobj.prg
@@ -50,8 +50,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 #include "common.ch"
diff --git a/harbour/source/debug/dbgtwin.prg b/harbour/source/debug/dbgtwin.prg
index 39b2659106..9d3886c094 100644
--- a/harbour/source/debug/dbgtwin.prg
+++ b/harbour/source/debug/dbgtwin.prg
@@ -65,8 +65,6 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 
diff --git a/harbour/source/debug/dbgwa.prg b/harbour/source/debug/dbgwa.prg
index 9b3910de62..76d1bc55d4 100644
--- a/harbour/source/debug/dbgwa.prg
+++ b/harbour/source/debug/dbgwa.prg
@@ -50,8 +50,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "common.ch"
 #include "setcurs.ch"
 #include "inkey.ch"
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index 6c1955fc9b..9e95779e44 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -62,8 +62,6 @@
          the debugger output may interfere with the applications output
          redirection, and is also slower. [vszakats] */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 #include "hbdebug.ch"   // for "nMode" of __dbgEntry
 #include "hbgtinfo.ch"
diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg
index 2cbf20e3ef..00e1b0bc66 100644
--- a/harbour/source/debug/tbrwtext.prg
+++ b/harbour/source/debug/tbrwtext.prg
@@ -50,8 +50,6 @@
  *
  */
 
-#pragma DEBUGINFO=OFF
-
 #include "hbclass.ch"
 
 #include "common.ch"