diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8ab4bfea88..1f29186998 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 14:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/libhpdf/Makefile
+    + Using new central detection function.
+      HB_WITH_LIBHPDF -> HB_INC_LIBHARU.
+
+  * contrib/hbhpdf/Makefile
+    * Minor formatting.
+
 2009-08-27 14:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/Makefile
     ! Fix to prev. (uploaded version from wrong local machine)
diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile
index 0af0400d66..fb8e0adf36 100644
--- a/harbour/contrib/hbhpdf/Makefile
+++ b/harbour/contrib/hbhpdf/Makefile
@@ -21,7 +21,7 @@ _DET_FLT_PLAT :=
 _DET_FLT_COMP :=
 _DET_INC_DEFP :=
 ifneq ($(HB_HOST_PLAT),dos)
-_DET_INC_DEFP += /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
+   _DET_INC_DEFP += /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
 endif
 _DET_INC_HEAD := /hpdf.h
 include $(TOP)$(ROOT)config/detfun.mk
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index 2f1e40943d..8bb3869637 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -8,60 +8,9 @@ include $(TOP)$(ROOT)config/global.mk
 
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
-HB_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
 
 LIBNAME := libhpdf
 
-ifeq ($(HB_WITH_LIBHPDF),)
-   HB_WITH_LIBHPDF := yes
-   ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-watcom)
-      HB_WITH_LIBHPDF := no
-   endif
-   # NOTE: dos hosts can't build this lib due to long filename. [vszakats]
-   ifeq ($(HB_HOST_PLAT),dos)
-      HB_WITH_LIBHPDF := no
-   endif
-   ifeq ($(HB_COMPILER),pocc64)
-      HB_WITH_LIBHPDF := no
-   endif
-   ifeq ($(HB_PLATFORM),wce)
-      HB_WITH_LIBHPDF := no
-   endif
-   ifeq ($(HB_COMPILER),mingwarm)
-      HB_WITH_LIBHPDF := yes
-      HB_CFLAGS += -U__COREDLL__
-   endif
-endif
-
-ifeq ($(HB_WITH_LIBHPDF),yes)
-
-ifeq ($(HB_INC_LIBPNG),)
-   ifeq ($(HB_XBUILD),)
-      HB_INC_LIBPNG = /usr/include
-      ifeq ($(HB_PLATFORM),win)
-         HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
-      endif
-      ifeq ($(HB_PLATFORM),wce)
-         HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
-      endif
-      ifeq ($(HB_PLATFORM),os2)
-         HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
-      endif
-      ifeq ($(HB_PLATFORM),dos)
-         HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
-      endif
-      ifeq ($(HB_PLATFORM),darwin)
-         HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
-      endif
-   endif
-endif
-
-HB_INC_LIBPNG_OK := $(foreach d, $(HB_INC_LIBPNG), $(if $(wildcard $(d)/png.h),$(d),))
-
-ifneq ($(strip $(HB_INC_LIBPNG_OK)),)
-
-HB_CFLAGS += $(foreach d,$(HB_INC_LIBPNG_OK),-I$(d))
-
 C_SOURCES := \
    _hbhbpdf.c \
    hpdf_annotation.c \
@@ -116,11 +65,61 @@ C_SOURCES := \
    hpdf_utils.c \
    hpdf_xref.c \
 
-include $(TOP)$(ROOT)config/lib.mk
+# decide whether to build it locally
+ifeq ($(HB_INC_LIBHARU),)
+   HB_INC_LIBHARU := yes
+   ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-watcom)
+      HB_INC_LIBHARU := no
+   endif
+   # NOTE: dos hosts can't build this lib due to long filename. [vszakats]
+   ifeq ($(HB_HOST_PLAT),dos)
+      HB_INC_LIBHARU := no
+   endif
+   ifeq ($(HB_COMPILER),pocc64)
+      HB_INC_LIBHARU := no
+   endif
+   ifeq ($(HB_PLATFORM),wce)
+      HB_INC_LIBHARU := no
+   endif
+   ifeq ($(HB_COMPILER),mingwarm)
+      HB_INC_LIBHARU := yes
+   endif
+endif
 
+ifneq ($(HB_INC_LIBHARU),no)
+
+   _DET_DSP_NAME := libpng
+   _DET_VAR_INC_ := HB_INC_PNG
+   _DET_VAR_HAS_ := HB_HAS_PNG
+   _DET_FLT_PLAT :=
+   _DET_FLT_COMP :=
+   _DET_INC_DEFP := /usr/include
+   ifneq ($(filter $(HB_PLATFORM),win wce os2 dos darwin),)
+      HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
+   endif
+   _DET_INC_HEAD := /png.h
+   include $(TOP)$(ROOT)config/detfun.mk
+
+   ifneq ($(HB_HAS_PNG),)
+
+      HB_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
+      HB_CFLAGS += $(foreach d,$(HB_HAS_PNG),-I$(d))
+
+      ifeq ($(HB_COMPILER),mingwarm)
+         HB_CFLAGS += -U__COREDLL__
+      endif
+
+      include $(TOP)$(ROOT)config/header.mk
+      INSTALL_RULE_HEADERS := $(INSTALL_RULE)
+      include $(TOP)$(ROOT)config/lib.mk
+
+      install::
+	$(INSTALL_RULE_HEADERS)
+
+   else
+      HB_SKIP_REASON := $(_DET_RES_TEXT)
+      include $(TOP)$(ROOT)config/none.mk
+   endif
 else
-include $(TOP)$(ROOT)config/none.mk
-endif
-else
-include $(TOP)$(ROOT)config/none.mk
+   include $(TOP)$(ROOT)config/none.mk
 endif