diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1f2844e583..f9c05398e2 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,10 +7,18 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2017-12-15 19:53 UTC+0100 Aleksander Czajczynski (hb fki.pl)
+  * contrib/hbexpat/3rd/expat/expat.hbp
+    ! add missing bits, previous commit failed to include expat_co[nfig].h
+      on non-win platforms
+
+  * ChangeLog.txt
+    ! typo
+
 2017-12-14 14:20 UTC+0100 Aleksander Czajczynski (hb fki.pl)
   * contrib/hbamf/amfenc.c
     * update amf3_Encode() serialize function with great idea of Przemek
-      implemented recenly in hb_Serialize(). Checking garbage collector
+      implemented recently in hb_Serialize(). Checking garbage collector
       reference count can save time here too, unique arrays and hashes won't
       be indexed as references.
 
diff --git a/contrib/hbexpat/3rd/expat/expat.hbp b/contrib/hbexpat/3rd/expat/expat.hbp
index 2c258420eb..8dc8e05436 100644
--- a/contrib/hbexpat/3rd/expat/expat.hbp
+++ b/contrib/hbexpat/3rd/expat/expat.hbp
@@ -16,7 +16,15 @@ xmlparse.c
 xmlrole.c
 xmltok.c
 
--cflag=-DHARBOUR_CONF
+-cflag=-DNDEBUG{!debug}
+-cflag=-DHAVE_EXPAT_CONFIG_H
+# needed to have <expat_config.h> found:
+-I.
+
+# Use Harbour core arc4random implementation only when building static lib.
+# This way the dynamic lib won't depend on Harbour dynlib.
+-cflag=-DHB_FORCE_ARC4RANDOM{!hbdyn}
+
 {hblib}-cflag=-DXML_STATIC
 {bcc}-cflag=-w-8057
 {bcc}-cflag=-w-8008