diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9781c64b8f..11bd3d998e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-25 12:17 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/minizip/minizip.dif
+    ! Deleted svn:keywords property.
+
+  * external/libhpdf/Makefile
+  + external/libhpdf/libhpdf.dif
+  * external/patchup.prg
+    + Patch by Tamas Tevesz to fix a recent regression.
+
 2010-06-25 10:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/patchup.prg
     ! Minor fix to make Makefile line splitting eol type agnostic.
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index ae2ca58839..5a217268cb 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -140,7 +140,7 @@ endif
 # ORIGIN http://libharu.org/
 # VER    2.1.0
 # URL    http://libharu.org/files/libharu-2.1.0.tar.gz
-# DIFF
+# DIFF   libhpdf.dif
 #
 # MAP    README
 # MAP    src/hpdf_annotation.c          hpdfanno.c
diff --git a/harbour/external/libhpdf/libhpdf.dif b/harbour/external/libhpdf/libhpdf.dif
new file mode 100644
index 0000000000..248603158b
--- /dev/null
+++ b/harbour/external/libhpdf/libhpdf.dif
@@ -0,0 +1,24 @@
+diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
+--- libhpdf.orig/hpdf.h	2010-06-25 10:49:11.777329891 +0200
++++ libhpdf/hpdf.h	2010-06-25 10:49:11.777329891 +0200
+@@ -17,7 +17,7 @@
+ #ifndef _HPDF_H
+ #define _HPDF_H
+ 
+-#include "hpdf_config.h"
++#include "hpdfcfg.h"
+ #include "hpdfvers.h"
+ 
+ #ifdef HPDF_DLL_MAKE
+diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
+--- libhpdf.orig/hpdfutil.h	2010-06-25 10:49:12.057330264 +0200
++++ libhpdf/hpdfutil.h	2010-06-25 10:49:12.057330264 +0200
+@@ -18,7 +18,7 @@
+ #ifndef _HPDF_UTILS_H
+ #define _HPDF_UTILS_H
+ 
+-#include "hpdf_config.h"
++#include "hpdfcfg.h"
+ #include "hpdftype.h"
+ 
+ #ifdef __cplusplus
diff --git a/harbour/external/patchup.prg b/harbour/external/patchup.prg
index bcaa2c0215..7be604ea17 100644
--- a/harbour/external/patchup.prg
+++ b/harbour/external/patchup.prg
@@ -756,6 +756,8 @@ STATIC FUNCTION hb_FileTran( cFileName )
    LOCAL cFileContent
    LOCAL cTransformedContent
    LOCAL aChange
+   LOCAL cChangeFrom
+   LOCAL cChangeTo
 
    cFileContent := hb_MemoRead( cFileName )
 
@@ -766,15 +768,22 @@ STATIC FUNCTION hb_FileTran( cFileName )
    cTransformedContent := StrTran( cTransformedContent, Chr( 10 ), OSNL )
 
    FOR EACH aChange IN s_aChangeMap
+
+      /* This is a shot in the dark. Haru works with this transform,
+       * but other components may very well need different handling. */
+      cChangeFrom := FN_NameExtGet( aChange[ 1 ] )
+      cChangeTo := aChange[ 2 ]
+
       /* Local-style includes */
       cTransformedContent := StrTran( cTransformedContent,                                ;
-                                      Chr( 34 ) + aChange[ 1 ] + Chr( 34 ),               ;
-                                      Chr( 34 ) + aChange[ 2 ] + Chr( 34 ) )
+                                      Chr( 34 ) + cChangeFrom + Chr( 34 ),                ;
+                                      Chr( 34 ) + cChangeTo + Chr( 34 ) ) 
 
       /* System-style include */
       cTransformedContent := StrTran( cTransformedContent,                                ;
-                                      "<" + aChange[ 1 ] + ">",                           ;
-                                      "<" + aChange[ 2 ] + ">" )
+                                      "<" + cChangeFrom + ">",                            ;
+                                      "<" + cChangeTo + ">" )
+
    NEXT
 
    RETURN hb_MemoWrit( cFileName, cTransformedContent )