diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9aa27bb6b5..7c6e753048 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,23 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2017-12-20 11:34 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbexpat/3rd/expat/loadlibr.c
+    ! define _UNICODE macro when UNICODE is also defined - it should be fixed
+      in EXPAT core code. It fixes Windows builds.
+
+  * contrib/hbexpat/3rd/expat/xmlparse.c
+    ! restored fix for WINCE builds
+
+  * contrib/hbtip/client.prg
+    ! restored #undef __HBEXTREQ__ before #include "hbssl.hbx".
+      It fixes non SSL builds and binding HBTIP with all HBSSL
+      functions.
+
+  * contrib/hbexpat/hbexpat.hbc
+    * added /usr/local/opt/expat/lib library path to darwin builds
+      (synced with Viktor's 3.4 branch)
+
 2017-12-19 21:42 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * config/darwin/clang.mk
   * config/darwin/gcc.mk
diff --git a/contrib/hbexpat/3rd/expat/loadlibr.c b/contrib/hbexpat/3rd/expat/loadlibr.c
index 35fdf98bce..04fedb3325 100644
--- a/contrib/hbexpat/3rd/expat/loadlibr.c
+++ b/contrib/hbexpat/3rd/expat/loadlibr.c
@@ -32,6 +32,9 @@
 
 #if defined(_WIN32)
 
+#if defined(UNICODE) && !defined(_UNICODE)
+#define _UNICODE
+#endif
 #include <windows.h>
 #include <tchar.h>
 
diff --git a/contrib/hbexpat/3rd/expat/xmlparse.c b/contrib/hbexpat/3rd/expat/xmlparse.c
index cfbed6df71..4e7e281626 100644
--- a/contrib/hbexpat/3rd/expat/xmlparse.c
+++ b/contrib/hbexpat/3rd/expat/xmlparse.c
@@ -846,7 +846,11 @@ gather_time_entropy(void)
 
 static unsigned long
 ENTROPY_DEBUG(const char * label, unsigned long entropy) {
+#ifdef _WINCE
+  const char * const EXPAT_ENTROPY_DEBUG = NULL;
+#else
   const char * const EXPAT_ENTROPY_DEBUG = getenv("EXPAT_ENTROPY_DEBUG");
+#endif
   if (EXPAT_ENTROPY_DEBUG && ! strcmp(EXPAT_ENTROPY_DEBUG, "1")) {
     fprintf(stderr, "Entropy: %s --> 0x%0*lx (%lu bytes)\n",
         label,
diff --git a/contrib/hbexpat/hbexpat.hbc b/contrib/hbexpat/hbexpat.hbc
index c30c1d3cb5..030cc39e2f 100644
--- a/contrib/hbexpat/hbexpat.hbc
+++ b/contrib/hbexpat/hbexpat.hbc
@@ -5,4 +5,6 @@ incpaths=.
 headers=${hb_name}.ch
 
 libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
+
+libpaths=/usr/local/opt/expat/lib{darwin}
 libs=3rd/expat/expat.hbc
diff --git a/contrib/hbtip/client.prg b/contrib/hbtip/client.prg
index 0fe95c5c10..532da9b55f 100644
--- a/contrib/hbtip/client.prg
+++ b/contrib/hbtip/client.prg
@@ -59,6 +59,7 @@
 #endif
 
 #include "hbssl.ch"
+#undef __HBEXTREQ__
 #include "hbssl.hbx"
 
 #define RCV_BUF_SIZE  Int( ::InetRcvBufSize( ::SocketCon ) / 2 )