diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 50a890ad9e..8321c9e349 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-10 01:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/hbpcre/Makefile
+  * config/linux/sunpro.mk
+  * config/sunos/sunpro.mk
+    * Moved hbpcre lib specific sunpro compiler option tweaks to
+      lib local Makefile.
+
+  * config/detect.mk
+    + Added zlib and pcre lib detection. (not yet used)
+
 2009-09-09 22:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/gtqtc/Makefile
     ! Fix little (but fatal) mistake.
diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk
index ed5d1bc187..d698e2e509 100644
--- a/harbour/config/detect.mk
+++ b/harbour/config/detect.mk
@@ -18,6 +18,8 @@ export DETECT_MK_ := yes
 _DET_OPT_VERB := very
 
 # Reset everything to default
+export HB_HAS_ZLIB    :=
+export HB_HAS_PCRE    :=
 export HB_HAS_OPENSSL :=
 export HB_HAS_GPM     :=
 export HB_HAS_SLANG   :=
@@ -36,6 +38,30 @@ endif
 
 -include $(TOP)$(ROOT)config/conf.mk
 
+# Detect zlib
+
+_DET_DSP_NAME := zlib
+_DET_VAR_INC_ := HB_INC_ZLIB
+_DET_VAR_HAS_ := HB_HAS_ZLIB
+_DET_FLT_PLAT :=
+_DET_FLT_COMP :=
+_DET_INC_DEFP := /usr/include
+_DET_INC_HEAD := /zlib.h
+
+include $(TOP)$(ROOT)config/detfun.mk
+
+# Detect pcre
+
+_DET_DSP_NAME := pcre
+_DET_VAR_INC_ := HB_INC_PCRE
+_DET_VAR_HAS_ := HB_HAS_PCRE
+_DET_FLT_PLAT :=
+_DET_FLT_COMP :=
+_DET_INC_DEFP := /usr/include
+_DET_INC_HEAD := /pcre.h
+
+include $(TOP)$(ROOT)config/detfun.mk
+
 # Detect OpenSSL
 
 _DET_DSP_NAME := openssl
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 0942f80f99..7ca317ca99 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -35,10 +35,6 @@ ifneq ($(HB_BUILD_OPTIM),no)
    # Try to keep them this way.
    CFLAGS += -fast
    CFLAGS += -xnolibmopt
-   # workaround for problems in x86 PIC builds exploited by hbpcre library code
-   ifeq ($(LIBNAME),hbpcre)
-      CFLAGS += -xbuiltin=%none
-   endif
 endif
 
 # force position independent code for harbour shared library
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index 8a05503dd7..188319ff40 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -35,12 +35,6 @@ ifneq ($(HB_BUILD_OPTIM),no)
    # Try to keep them this way.
    CFLAGS += -fast
    CFLAGS += -xnolibmopt
-   # workaround for problems in x86 PIC builds exploited by hbpcre library code
-   ifeq ($(LIBNAME),hbpcre)
-      ifneq ($(findstring sparc,$(shell isalist)),sparc)
-         CFLAGS += -xbuiltin=%none
-      endif
-   endif
 endif
 
 # force position independent code for harbour shared library
diff --git a/harbour/source/hbpcre/Makefile b/harbour/source/hbpcre/Makefile
index c50259b3b7..cf5b62db1b 100644
--- a/harbour/source/hbpcre/Makefile
+++ b/harbour/source/hbpcre/Makefile
@@ -30,4 +30,15 @@ C_SOURCES := \
 
 LIBNAME := hbpcre
 
+# workaround for problems in sunpro x86 PIC builds exploited by hbpcre library code
+ifeq ($(HB_COMPILER),sunpro)
+   ifeq ($(HB_PLATFORM),sunos)
+      ifeq ($(findstring sparc,$(shell isalist)),)
+         HB_CFLAGS += -xbuiltin=%none
+      endif
+   else
+      HB_CFLAGS += -xbuiltin=%none
+   endif
+endif
+
 include $(TOP)$(ROOT)config/lib.mk