diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bd916054d4..092c914a15 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-09 01:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/hbexpat/3rd/expat/expat.dif
+  * contrib/hbexpat/3rd/expat/expat.hbp
+    + Added .dif file.
+
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+    * Updated .dif file.
+
+  ; NOTE: Previous failures were caused by .hbs extension being
+          associated with hbrun and I relied on this when running
+          hb3rdpat.hbs. It wouldn't work this way, and I experienced
+          various unexpected behavior in such case with other scripts
+          too in the past. So moral of the story, always use
+          'hbrun <name>.hbs', at least on Windows.
+
 2010-11-09 01:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/Makefile
     % small optimization in concurrent build (-j GNU make switch) dependency
diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.dif b/harbour/contrib/hbexpat/3rd/expat/expat.dif
new file mode 100644
index 0000000000..f76bb4d2c2
--- /dev/null
+++ b/harbour/contrib/hbexpat/3rd/expat/expat.dif
@@ -0,0 +1,168 @@
+diff -urN expat.orig\xmlparse.c expat\xmlparse.c
+--- expat.orig\xmlparse.c	Tue Nov 09 01:33:28 2010
++++ expat\xmlparse.c	Tue Nov 09 01:33:28 2010
+@@ -8,7 +8,9 @@
+ 
+ #define XML_BUILDING_EXPAT 1
+ 
+-#ifdef COMPILED_FROM_DSP
++#ifdef HARBOUR_CONF
++#include "_hbconf.h"
++#elif defined(COMPILED_FROM_DSP)
+ #include "winconfi.h"
+ #elif defined(MACOS_CLASSIC)
+ #include "macconfi.h"
+diff -urN expat.orig\xmlrole.c expat\xmlrole.c
+--- expat.orig\xmlrole.c	Tue Nov 09 01:33:28 2010
++++ expat\xmlrole.c	Tue Nov 09 01:33:28 2010
+@@ -4,7 +4,9 @@
+ 
+ #include <stddef.h>
+ 
+-#ifdef COMPILED_FROM_DSP
++#ifdef HARBOUR_CONF
++#include "_hbconf.h"
++#elif defined(COMPILED_FROM_DSP)
+ #include "winconfi.h"
+ #elif defined(MACOS_CLASSIC)
+ #include "macconfi.h"
+diff -urN expat.orig\xmltok.c expat\xmltok.c
+--- expat.orig\xmltok.c	Tue Nov 09 01:33:28 2010
++++ expat\xmltok.c	Tue Nov 09 01:33:28 2010
+@@ -4,7 +4,9 @@
+ 
+ #include <stddef.h>
+ 
+-#ifdef COMPILED_FROM_DSP
++#ifdef HARBOUR_CONF
++#include "_hbconf.h"
++#elif defined(COMPILED_FROM_DSP)
+ #include "winconfi.h"
+ #elif defined(MACOS_CLASSIC)
+ #include "macconfi.h"
+@@ -222,6 +224,17 @@
+  E ## isInvalid3, \
+  E ## isInvalid4
+ 
++#define NULL_VTABLE() \
++ NULL, \
++ NULL, \
++ NULL, \
++ NULL, \
++ NULL, \
++ NULL, \
++ NULL, \
++ NULL, \
++ NULL
++
+ static int FASTCALL checkCharRefNumber(int);
+ 
+ #include "xmltok_i.h"
+@@ -467,7 +480,7 @@
+ #include "asciitab.h"
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(sb_)
++  STANDARD_VTABLE(sb_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -480,7 +493,7 @@
+ #undef BT_COLON
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(sb_)
++  STANDARD_VTABLE(sb_) NULL_VTABLE()
+ };
+ 
+ static void PTRCALL
+@@ -500,7 +513,7 @@
+ #include "asciitab.h"
+ /* BT_NONXML == 0 */
+   },
+-  STANDARD_VTABLE(sb_)
++  STANDARD_VTABLE(sb_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -513,7 +526,7 @@
+ #undef BT_COLON
+ /* BT_NONXML == 0 */
+   },
+-  STANDARD_VTABLE(sb_)
++  STANDARD_VTABLE(sb_) NULL_VTABLE()
+ };
+ 
+ static int PTRFASTCALL
+@@ -726,7 +739,7 @@
+ #include "asciitab.h"
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(little2_)
++  STANDARD_VTABLE(little2_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -745,7 +758,7 @@
+ #undef BT_COLON
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(little2_)
++  STANDARD_VTABLE(little2_) NULL_VTABLE()
+ };
+ 
+ #if BYTEORDER != 4321
+@@ -758,7 +771,7 @@
+ #include "iasciita.h"
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(little2_)
++  STANDARD_VTABLE(little2_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -771,7 +784,7 @@
+ #undef BT_COLON
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(little2_)
++  STANDARD_VTABLE(little2_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -867,7 +880,7 @@
+ #include "asciitab.h"
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(big2_)
++  STANDARD_VTABLE(big2_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -886,7 +899,7 @@
+ #undef BT_COLON
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(big2_)
++  STANDARD_VTABLE(big2_) NULL_VTABLE()
+ };
+ 
+ #if BYTEORDER != 1234
+@@ -899,7 +912,7 @@
+ #include "iasciita.h"
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(big2_)
++  STANDARD_VTABLE(big2_) NULL_VTABLE()
+ };
+ 
+ #endif
+@@ -912,7 +925,7 @@
+ #undef BT_COLON
+ #include "latin1ta.h"
+   },
+-  STANDARD_VTABLE(big2_)
++  STANDARD_VTABLE(big2_) NULL_VTABLE()
+ };
+ 
+ #endif
diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbp b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
index 4050bad88d..a241b1589e 100644
--- a/harbour/contrib/hbexpat/3rd/expat/expat.hbp
+++ b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
@@ -22,7 +22,7 @@ xmltok.c
 # ORIGIN http://expat.sourceforge.net/
 # VER    2.0.1
 # URL    http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
-# DIFF
+# DIFF   expat.dif
 #
 # MAP    COPYING
 # MAP    lib/xmlparse.c       xmlparse.c
diff --git a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
index 787fecf080..9da167d0fe 100644
--- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
@@ -1,6 +1,6 @@
-diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
---- libhpdf.orig/hpdf.h	2010-10-23 14:01:35.000000000 +0200
-+++ libhpdf/hpdf.h	2010-10-23 14:01:35.000000000 +0200
+diff -urN libhpdf.orig\hpdf.h libhpdf\hpdf.h
+--- libhpdf.orig\hpdf.h	Tue Nov 09 01:34:54 2010
++++ libhpdf\hpdf.h	Tue Nov 09 01:34:54 2010
 @@ -17,7 +17,7 @@
  #ifndef _HPDF_H
  #define _HPDF_H
@@ -10,9 +10,18 @@ diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
  #include "hpdfvers.h"
  
  #ifdef HPDF_DLL_MAKE
-diff -urN libhpdf.orig/hpdfpdfa.c libhpdf/hpdfpdfa.c
---- libhpdf.orig/hpdfpdfa.c	2010-10-23 14:01:34.000000000 +0200
-+++ libhpdf/hpdfpdfa.c	2010-10-23 14:01:34.000000000 +0200
+@@ -472,7 +472,7 @@
+                                const char   *uri);
+ 
+ 
+-HPDF_Annotation
++HPDF_EXPORT(HPDF_Annotation)
+ HPDF_Page_CreateTextMarkupAnnot (HPDF_Page     page,
+ 								HPDF_Rect      rect,
+ 								const char     *text,
+diff -urN libhpdf.orig\hpdfpdfa.c libhpdf\hpdfpdfa.c
+--- libhpdf.orig\hpdfpdfa.c	Tue Nov 09 01:34:53 2010
++++ libhpdf\hpdfpdfa.c	Tue Nov 09 01:34:53 2010
 @@ -116,12 +116,12 @@
      HPDF_BYTE *currentTime;
      HPDF_BYTE idkey[HPDF_MD5_KEY_LEN];
@@ -27,9 +36,9 @@ diff -urN libhpdf.orig/hpdfpdfa.c libhpdf/hpdfpdfa.c
      id = HPDF_Dict_GetItem(pdf->trailer, "ID", HPDF_OCLASS_ARRAY);
      if (!id) {
         id = HPDF_Array_New(pdf->mmgr);
-diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
---- libhpdf.orig/hpdfutil.h	2010-10-23 14:01:36.000000000 +0200
-+++ libhpdf/hpdfutil.h	2010-10-23 14:01:36.000000000 +0200
+diff -urN libhpdf.orig\hpdfutil.h libhpdf\hpdfutil.h
+--- libhpdf.orig\hpdfutil.h	Tue Nov 09 01:34:55 2010
++++ libhpdf\hpdfutil.h	Tue Nov 09 01:34:55 2010
 @@ -18,7 +18,7 @@
  #ifndef _HPDF_UTILS_H
  #define _HPDF_UTILS_H