diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bbcc78c627..8c78540022 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,7 +17,26 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
-2010-04-12 08:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+2010-04-13 12:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/wce/poccarm.mk
+  * config/dos/watcom.mk
+  * config/win/xcc.mk
+  * config/win/pocc.mk
+  * config/win/bcc.mk
+  * config/win/watcom.mk
+  * config/linux/watcom.mk
+  * config/os2/watcom.mk
+    * Changed to not forcefully turn off warnings in some targets.
+      (so HB_BUILD_WARN=no is now equivalent to hbmk2 -warn=def)
+    ; NOTE: This will result in some new warnings in /external
+            dir since for above compilers I've now upped the
+            warning level from nothing to the default level.
+
+  * external/zlib/Makefile
+    * Changed to not set Harbour level warnings for this
+      external component (in sync with all the others).
+
+2010-04-13 08:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbide/ideprojmanager.prg
     ! Properly fixed old problem with executable name extraction,
       leaving the ending delimiter in the extracted string.
diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk
index 4bb8a037b7..a58790b74a 100644
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -22,8 +22,6 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
-else
-   CFLAGS += -w0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk
index e64b310403..87f4a801a8 100644
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -21,8 +21,6 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
-else
-   CFLAGS += -w0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk
index 41aef3128b..4519fdebb1 100644
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -23,8 +23,6 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
-else
-   CFLAGS += -w0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk
index e902f7098f..a73c492241 100644
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -22,8 +22,6 @@ CFLAGS += -Ze -Go
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W1
-else
-   CFLAGS += -W0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index ef8da2b24e..c354d32aed 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -20,8 +20,6 @@ CFLAGS += -q -tWM -CP437
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w -w-sig- -Q
-else
-   CFLAGS += -w-
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk
index bd7ee55261..1b3986bd8d 100644
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -20,8 +20,6 @@ CFLAGS += -Ze -Go -MT
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W1
-else
-   CFLAGS += -W0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index 01c120a2ff..741588934f 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -23,8 +23,6 @@ LDFLAGS += OP quiet
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -w3
-else
-   CFLAGS += -w0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk
index 9ff8920732..2c40b760ab 100644
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -25,8 +25,6 @@ CFLAGS += -MT
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W1
-else
-   CFLAGS += -W0
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/external/zlib/Makefile b/harbour/external/zlib/Makefile
index 24354c1c53..fb7ceac074 100644
--- a/harbour/external/zlib/Makefile
+++ b/harbour/external/zlib/Makefile
@@ -8,6 +8,7 @@ include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbzlib
 
+HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
 C_SOURCES := \