diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a0b5c7d3be..ffe09e5a60 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-01 16:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+    ! Fixed to build with pocc after recent png update.
+
+  * src/rtl/hbfilehi.prg
+    * Comments.
+
 2011-02-01 14:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/hbnetio/netiosrv.prg
   * contrib/hbnetio/utils/hbnetio/netiocon.prg
diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
index 57d0eb90d6..f178eed129 100644
--- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
@@ -29,6 +29,7 @@
 -depincpathlocal=zlib:../../../../src/3rd/zlib
 
 -cflag=-DHPDF_DLL_MAKE_CDECL{allwin&hbdyn}
+-cflag=-DPNG_ALLOCATED{allpocc}
 -cflag=-U__COREDLL__{mingwarm}
 
 _hbhbpdf.c
diff --git a/harbour/src/rtl/hbfilehi.prg b/harbour/src/rtl/hbfilehi.prg
index 39ef21be3d..29c8aa9d3b 100644
--- a/harbour/src/rtl/hbfilehi.prg
+++ b/harbour/src/rtl/hbfilehi.prg
@@ -51,7 +51,6 @@
  */
 
 /* QUESTION: How to return success/failure when dir is passed? */
-
 FUNCTION hb_cwd( cNewDir )
    IF hb_isString( cNewDir )
       /* TODO */
@@ -61,6 +60,7 @@ FUNCTION hb_cwd( cNewDir )
 #define _ISDRIVESPEC( cDir ) ( ! Empty( hb_osDriveSeparator() ) .AND. Right( cDir, Len( hb_osDriveSeparator() ) ) == hb_osDriveSeparator() )
 
 /* NOTE: Can hurt if there are symlinks on the way. */
+/* QUESTION: Rename to hb_PathOptimize() ? */
 FUNCTION hb_PathNormalize( cPath )
    LOCAL aDir
    LOCAL cDir