diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0235fdba74..2a817ff500 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-20 21:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+  * config/rules.mk
+  * external/pcre/Makefile
+    + Added HB_CFLAGS_STA variable to hold C compiler options
+      passed solely when compiling for static lib.
+    * Change PCRE setup to use HB_CFLAGS_STA instead of -U
+      trick at the same time silencing msvc warning.
+
 2010-05-20 20:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
   * config/rules.mk
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index a3dabd593c..2223e999d4 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1107,12 +1107,15 @@ endif
 # Notice that even single lib/bin builds will currently
 # result in recursive runs, see rule 'descend'. [vszakats]
 HB_CFLAGS :=
-# C flags passed when compiling to create .dll
-HB_CFLAGS_DYN :=
 HB_LDFLAGS :=
 HB_AFLAGS :=
 HB_PRGFLAGS :=
 
+# C flags passed when compiling to create static lib
+HB_CFLAGS_STA :=
+# C flags passed when compiling to create dynamic lib
+HB_CFLAGS_DYN :=
+
 CFLAGS :=
 ARFLAGS :=
 LDFLAGS :=
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index 4bb5a18660..e558797ecf 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -44,7 +44,7 @@ ifeq ($(CC_RULE),)
          ifneq ($(LIBNAME),)
             ifneq ($(filter $(LIBNAME),$(HB_DYN_LIBS)),)
                define cc_comp_all
-                  $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<)
+                  $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(HB_CFLAGS_STA) $(CC_IN) $<)
                   $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(HB_CFLAGS_DYN) $(CC_IN) $<)
                endef
                CC_RULE = $(cc_comp_all)
diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile
index c4920193c8..6ec869aca3 100644
--- a/harbour/external/pcre/Makefile
+++ b/harbour/external/pcre/Makefile
@@ -36,9 +36,8 @@ LIBNAME := hbpcre
 ifneq ($(HB_HAS_PCRE_LOCAL),)
 
    HB_CFLAGS += -DHAVE_STDINT_H=0
-   # only needed for win/wce, for other platforms these are noops
-   HB_CFLAGS += -DPCRE_STATIC
-   HB_CFLAGS_DYN := -UPCRE_STATIC
+   # only needed for win/wce, for other platforms this is noop
+   HB_CFLAGS_STA := -DPCRE_STATIC
 
    ifneq ($(filter $(HB_COMPILER),bcc msvc msvc64 msvcia64 icc iccia64),)
       HB_CFLAGS += -DHAVE_INTTYPES_H=0