diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8c0c0192a7..0caa347e43 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,36 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-23 01:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    * Reverted bcc experimental warning tweak.
+    * Fine tuned bcc -warn levels.
+    ! Fixed sunpro warning levels.
+
+  * config/beos/gcc.mk
+  * config/bsd/gcc.mk
+  * config/wce/mingwarm.mk
+  * config/darwin/gcc.mk
+  * config/darwin/clang.mk
+  * config/hpux/gcc.mk
+  * config/dos/djgpp.mk
+  * config/win/mingw.mk
+  * config/win/cygwin.mk
+  * config/linux/gcc.mk
+  * config/linux/clang.mk
+  * config/os2/gcc.mk
+  * config/sunos/gcc.mk
+    + Upped 'HB_BUILD_WARN=no' warning level for GCC
+      and compatible compilers to '-W'.
+
+  * config/linux/sunpro.mk
+  * config/sunos/sunpro.mk
+    ! Fixed to not disable all warnings explicitly
+      in HB_BUILD_WARN=no mode.
+
+  * config/win/bcc.mk
+    * Minor sync with hbmk2.
+
 2010-04-23 01:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/beos/gcc.mk
   * config/bsd/gcc.mk
diff --git a/harbour/config/beos/gcc.mk b/harbour/config/beos/gcc.mk
index ca0ac2c01d..30ad503ce0 100644
--- a/harbour/config/beos/gcc.mk
+++ b/harbour/config/beos/gcc.mk
@@ -22,6 +22,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index ec0bb6c382..6e79f7f4b2 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -20,6 +20,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk
index baa987d3ab..b851b91fdf 100644
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -29,6 +29,8 @@ CFLAGS += -fno-common
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk
index 49815a42b2..7355cb82b6 100644
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -30,6 +30,8 @@ CFLAGS += -fno-common
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index a596cae87a..9fcba8bb84 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -21,6 +21,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk
index 8b6ebcb3af..5044e5ca5a 100644
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -26,6 +26,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/linux/clang.mk b/harbour/config/linux/clang.mk
index 161f5a3eda..b501b651b2 100644
--- a/harbour/config/linux/clang.mk
+++ b/harbour/config/linux/clang.mk
@@ -27,6 +27,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk
index c433a44372..d97e2a0df9 100644
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -24,6 +24,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 9c18060a0b..23eefd598d 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -44,8 +44,6 @@ LDFLAGS += $(HB_ISAOPT)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -erroff=%none
-else
-   CFLAGS += -erroff=%all
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 45febbd99a..d97284c7cf 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -29,6 +29,8 @@ endif
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk
index 23fc74eb4c..bd3e143766 100644
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -24,6 +24,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index 92d0be84da..09f9f2e346 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -49,8 +49,6 @@ LDFLAGS += $(HB_ISAOPT)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -erroff=%none
-else
-   CFLAGS += -erroff=%all
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk
index fc1e39884d..202dc8d358 100644
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -20,6 +20,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index c354d32aed..cb8af72578 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -19,7 +19,7 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 CFLAGS += -q -tWM -CP437
 
 ifneq ($(HB_BUILD_WARN),no)
-   CFLAGS += -w -w-sig- -Q
+   CFLAGS += -w -Q -w-sig-
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk
index 86b0ed6daa..a8891815ac 100644
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -20,6 +20,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk
index 9da58534aa..532091861d 100644
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -29,6 +29,8 @@ CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
+else
+   CFLAGS += -W
 endif
 
 ifneq ($(HB_BUILD_OPTIM),no)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 77858c347b..fe6b3daba1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3162,10 +3162,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             cOpt_CompC += " -d -6 -O2 -OS -Ov -Oi -Oc"
          ENDIF
          SWITCH hbmk[ _HBMK_nWARN ]
-         CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q" )      ; EXIT
-         CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q" )      ; EXIT
-         CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -w-sig-" ) ; EXIT
-         CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-" )        ; EXIT
+         CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q" )         ; EXIT
+         CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q -w-sig-" ) ; EXIT
+         CASE _WARN_LOW ; EXIT
+         CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-" )           ; EXIT
          ENDSWITCH
          cOpt_CompC += " {FC} {LC}"
          cBin_Res := "brcc32.exe"
@@ -3543,8 +3543,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          SWITCH hbmk[ _HBMK_nWARN ]
          CASE _WARN_MAX
          CASE _WARN_YES
-         CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-erroff=%all" )  ; EXIT
-         CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-erroff=%none" ) ; EXIT
+         CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-erroff=%none" ) ; EXIT
+         CASE _WARN_NO  ; AAdd( hbmk[ _HBMK_aOPTC ], "-erroff=%all" ) ; EXIT
          ENDSWITCH
          IF ! Empty( cWorkDir )
             cOpt_CompC += " {IC} -o {OO}"