diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6f72b6dd09..0235fdba74 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-20 20:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+  * config/rules.mk
+    + Added HB_CFLAGS_DYN variable to pass lib specific options
+      specially directed to compilation phase when building
+      to create a .dll. Currently this affects pcre and zlib since
+      these are included in harbour .dll.
+
+  * external/libhpdf/Makefile
+  * external/pcre/Makefile
+  * external/png/Makefile
+  * external/zlib/Makefile
+    + Configured HB_CFLAGS_DYN for these libs to properly create
+      exported symbols in harbour .dll. This was a problem so far
+      for any non-mingw made harbour .dll.
+
 2010-05-20 19:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rdd/dbf1.c
     * minor cleanup
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index a3b23bb9ea..a3dabd593c 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1107,6 +1107,8 @@ 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 :=
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index 816fb8bb37..4bb5a18660 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -45,7 +45,7 @@ ifeq ($(CC_RULE),)
             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_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(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)
             endif
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index f14ebb9ab8..76855cc7c5 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -112,6 +112,7 @@ ifeq ($(HB_SUPPORTED),yes)
             HB_CFLAGS += $(foreach d,$(HB_HAS_PNG),-I$(d))
             # Suppress deprecated warnings until libharu gets updated for latest libpng
             HB_CFLAGS += -DPNG_NO_PEDANTIC_WARNINGS
+            HB_CFLAGS_DYN := -DHPDF_DLL_MAKE
 
             ifeq ($(HB_COMPILER),mingwarm)
                HB_CFLAGS += -U__COREDLL__
diff --git a/harbour/external/pcre/Makefile b/harbour/external/pcre/Makefile
index 3b4c44ffaf..c4920193c8 100644
--- a/harbour/external/pcre/Makefile
+++ b/harbour/external/pcre/Makefile
@@ -35,7 +35,10 @@ LIBNAME := hbpcre
 
 ifneq ($(HB_HAS_PCRE_LOCAL),)
 
-   HB_CFLAGS += -DPCRE_STATIC -DHAVE_STDINT_H=0
+   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
 
    ifneq ($(filter $(HB_COMPILER),bcc msvc msvc64 msvcia64 icc iccia64),)
       HB_CFLAGS += -DHAVE_INTTYPES_H=0
diff --git a/harbour/external/png/Makefile b/harbour/external/png/Makefile
index 241b743ccb..5b69fde916 100644
--- a/harbour/external/png/Makefile
+++ b/harbour/external/png/Makefile
@@ -45,6 +45,7 @@ ifeq ($(filter $(HB_COMPILER),poccarm xcc),)
       ifneq ($(HB_HAS_ZLIB),)
 
          HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
+         HB_CFLAGS_DYN := -DPNG_BUILD_DLL
 
          ifeq ($(HB_COMPILER),djgpp)
             HB_CFLAGS += -DPNG_NO_SNPRINTF
diff --git a/harbour/external/zlib/Makefile b/harbour/external/zlib/Makefile
index fb7ceac074..48b457013c 100644
--- a/harbour/external/zlib/Makefile
+++ b/harbour/external/zlib/Makefile
@@ -11,6 +11,8 @@ LIBNAME := hbzlib
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
+HB_CFLAGS_DYN := -DZLIB_DLL
+
 C_SOURCES := \
    adler32.c \
    compress.c \