diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 31f8ab19f6..20200b519b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-13 13:51 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+  * make_gcc.mak
+  * make_vc.mak
+  * contrib/mtpl_b32.mak
+  * contrib/mtpl_gcc.mak
+  * contrib/mtpl_vc.mak
+    + Added -l switch to default Harbour options.
+    + Enabling Harbour debug options (-b -l-) when HB_DEBUG_BUILD=yes.
+
 2008-10-13 12:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/compiler/gencc.c
     ! fixed thread static variable offsets generated in .c code when
diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak
index c51e0aac3a..1f4fd39e89 100644
--- a/harbour/contrib/mtpl_b32.mak
+++ b/harbour/contrib/mtpl_b32.mak
@@ -120,8 +120,11 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
 #**********************************************************
 
 CLIBFLAGS      = -c -q -d -Q -w -w-sig- $(CFLAGS) $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km $(PRG_USR) $(HARBOURFLAGS)
-LDFLAGS        =  $(LDFLAGS) $(L_USR)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
+!if "$(HB_BUILD_DEBUG)" == "yes"
+HARBOURFLAGS   = $(HARBOURFLAGS) -b -l-
+!endif
+LDFLAGS        = $(LDFLAGS) $(L_USR)
 
 #**********************************************************
 
diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak
index c4e9a60e4c..b7fc08a4a7 100644
--- a/harbour/contrib/mtpl_gcc.mak
+++ b/harbour/contrib/mtpl_gcc.mak
@@ -120,7 +120,10 @@ endif
 
 CFLAGS         := -W -Wall -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS)
 CLIBFLAGS      := -c $(CFLAGS) $(CLIBFLAGS)
-HARBOURFLAGS   := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   := -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
+ifeq ($(HB_BUILD_DEBUG),yes)
+HARBOURFLAGS   := $(HARBOURFLAGS) -b -l-
+endif
 LDFLAGS        := $(LDFLAGS)
 
 #**********************************************************
diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak
index a1d8941ce6..12fa2da27e 100644
--- a/harbour/contrib/mtpl_vc.mak
+++ b/harbour/contrib/mtpl_vc.mak
@@ -127,7 +127,10 @@ CFLAGS         = -Zi $(CFLAGS)
 #**********************************************************
 
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km -l $(PRG_USR) $(HARBOURFLAGS)
+!if "$(HB_BUILD_DEBUG)" == "yes"
+HARBOURFLAGS   = $(HARBOURFLAGS) -b -l-
+!endif
 LDFLAGS        =  $(LDFLAGS) $(L_USR)
 
 #**********************************************************
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index 6784b2f277..ea2bee5538 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -110,7 +110,10 @@ CEXEFLAGSDLL   = $(HB_BCCDLL_DYNRT) $(CLIBFLAGS)
 #**********************************************************
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
+!if "$(HB_BUILD_DEBUG)" == "yes"
+HBFLAGSCMN     = $(HBFLAGSCMN) -b -l-
+!endif
 HARBOURFLAGS   = -n $(HBFLAGSCMN)
 HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN)
 
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index 6b7f605484..69899a00c9 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -176,7 +176,10 @@ endif
 # Harbour Compiler Flags
 #**********************************************************
 
-HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km $(PRG_USR)
+HBFLAGSCMN     := -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
+ifeq ($(HB_BUILD_DEBUG),yes)
+HBFLAGSCMN     := $(HBFLAGSCMN) -b -l-
+endif
 HARBOURFLAGS   := -n $(HBFLAGSCMN)
 HARBOURFLAGSDLL:= -n1 $(HBFLAGSCMN)
 
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 43e1253596..460ca0a23d 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -163,7 +163,10 @@ CEXEFLAGSDLL   = -MT$(DBGMARKER) $(CLIBFLAGS)
 #**********************************************************
 
 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w3 -es2 -km -l $(PRG_USR)
+!if "$(HB_BUILD_DEBUG)" == "yes"
+HBFLAGSCMN     = $(HBFLAGSCMN) -b -l-
+!endif
 !if "$(HB_BUILD_WINCE)" == "yes"
 HBFLAGSCMN     = $(HBFLAGSCMN) -D__PLATFORM__WINCE
 !endif