diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8a354f3ae7..fcb411c0a0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 21:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/libhpdf/Makefile
+    ! Fixed typo in recent rework, causing embedded libpng
+      component not being detected.
+
+  * config/global.mk
+    ! Reverted override support. This will need 3.81.90,
+      in 3.81 override and export keywords don't mix tool
+      well together, or I'm missing something, it could be.
+
 2009-08-27 20:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     + Added new HB_INC_* values to the list. Added more
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index ac6a54e34d..af73c242d1 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -215,16 +215,13 @@ ifeq ($(HB_INIT_DONE),)
 
       # 'clean' and 'install' are required when building a release package
       ifeq ($(filter clean,$(HB_MAKECMDGOALS)),)
-         override HB_BUILD_PKG := no
-         export HB_BUILD_PKG
+         export HB_BUILD_PKG := no
       else
          ifeq ($(filter install,$(HB_MAKECMDGOALS)),)
-            override HB_BUILD_PKG := no
-            export HB_BUILD_PKG
+            export HB_BUILD_PKG := no
          else
             ifneq ($(ROOT),./)
-               override HB_BUILD_PKG := no
-               export HB_BUILD_PKG
+               export HB_BUILD_PKG := no
             endif
          endif
       endif
@@ -234,14 +231,10 @@ ifeq ($(HB_INIT_DONE),)
       endif
 
       # Enforce some basic setting for release packages
-      override HB_BUILD_DLL := yes
-      override HB_BUILD_IMPLIB := no
-      override HB_BUILD_OPTIM := yes
-      override HB_BUILD_DEBUG := no
-      export HB_BUILD_DLL
-      export HB_BUILD_IMPLIB
-      export HB_BUILD_OPTIM
-      export HB_BUILD_DEBUG
+      export HB_BUILD_DLL := yes
+      export HB_BUILD_IMPLIB := no
+      export HB_BUILD_OPTIM := yes
+      export HB_BUILD_DEBUG := no
    endif
 endif
 
@@ -1156,13 +1149,13 @@ HB_INSTALL_PREFIX_TOP := $(subst /,$(DIRSEP),$(realpath $(TOP)$(ROOT)))
 ifeq ($(HB_BUILD_PKG),yes)
    ifeq ($(HB_INIT_DONE),)
       export HB_TOP := $(subst /,$(DIRSEP),$(realpath $(TOP)$(ROOT)))
-      override HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(abspath $(PKG_DIR)/$(HB_PKGNAME)))
+      HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(abspath $(PKG_DIR)/$(HB_PKGNAME)))
 
-      override HB_BIN_INSTALL :=
-      override HB_INC_INSTALL :=
-      override HB_LIB_INSTALL :=
-      override HB_DYN_INSTALL :=
-      override HB_DOC_INSTALL :=
+      HB_BIN_INSTALL :=
+      HB_INC_INSTALL :=
+      HB_LIB_INSTALL :=
+      HB_DYN_INSTALL :=
+      HB_DOC_INSTALL :=
    endif
 else
    # Fill it automatically if not specified
@@ -1193,11 +1186,11 @@ else
       #        recursive operation here.
 
       # Handle simple macros in value
-      override HB_INSTALL_PREFIX := $(subst {hb_plat},$(HB_PLATFORM),$(HB_INSTALL_PREFIX))
-      override HB_INSTALL_PREFIX := $(subst {hb_comp},$(HB_COMPILER),$(HB_INSTALL_PREFIX))
-      override HB_INSTALL_PREFIX := $(subst {hb_cpu},$(HB_CPU),$(HB_INSTALL_PREFIX))
-      override HB_INSTALL_PREFIX := $(subst {hb_top},$(realpath $(TOP)$(ROOT)),$(HB_INSTALL_PREFIX))
-      override HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_plat},$(HB_PLATFORM),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_comp},$(HB_COMPILER),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_cpu},$(HB_CPU),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst {hb_top},$(realpath $(TOP)$(ROOT)),$(HB_INSTALL_PREFIX))
+      HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(HB_INSTALL_PREFIX))
    endif
 endif
 
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index 8bb3869637..c7c640e7fa 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -95,7 +95,7 @@ ifneq ($(HB_INC_LIBHARU),no)
    _DET_FLT_COMP :=
    _DET_INC_DEFP := /usr/include
    ifneq ($(filter $(HB_PLATFORM),win wce os2 dos darwin),)
-      HB_INC_LIBPNG += $(TOP)$(ROOT)external/libpng
+      _DET_INC_DEFP += $(TOP)$(ROOT)external/libpng
    endif
    _DET_INC_HEAD := /png.h
    include $(TOP)$(ROOT)config/detfun.mk