diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4b53aa2e39..2f513e4e0e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-09-09 23:16 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
+    ! removed obsolete memory.h
+
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+    * rediffed
+
+  * include/hbdate.h
+    * enabled reentrant safe version of localtime() and gmtime() in all
+      OpenWatcom builds
+
 2015-09-09 16:51 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/vm/estack.c
     ! protect access to HB_STACK_TLS_PRELOAD by hb_stack_ready() macro,
diff --git a/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c b/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
index ca1e11ef77..c5dc0dde36 100644
--- a/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
+++ b/contrib/hbhpdf/3rd/libhpdf/hpdfimac.c
@@ -18,7 +18,6 @@
 #include "hpdfconf.h"
 #include "hpdfutil.h"
 #include "hpdf.h"
-#include <memory.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif b/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
index 9b4074563c..3dd0b97018 100644
--- a/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
+++ b/contrib/hbhpdf/3rd/libhpdf/libhpdf.dif
@@ -1,6 +1,6 @@
 diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
---- libhpdf.orig/hpdf.h	2015-06-22 16:44:34.339421842 +0200
-+++ libhpdf/hpdf.h	2015-06-22 16:44:34.339421842 +0200
+--- libhpdf.orig/hpdf.h	2015-09-09 21:22:05.772098624 +0200
++++ libhpdf/hpdf.h	2015-09-09 21:22:05.772098624 +0200
 @@ -17,7 +17,7 @@
  #ifndef _HPDF_H
  #define _HPDF_H
@@ -20,17 +20,18 @@ diff -urN libhpdf.orig/hpdf.h libhpdf/hpdf.h
  								HPDF_Rect      rect,
  								const char     *text,
 diff -urN libhpdf.orig/hpdfimac.c libhpdf/hpdfimac.c
---- libhpdf.orig/hpdfimac.c	2015-06-22 16:44:34.251421845 +0200
-+++ libhpdf/hpdfimac.c	2015-06-22 16:44:34.251421845 +0200
-@@ -19,6 +19,7 @@
+--- libhpdf.orig/hpdfimac.c	2015-09-09 21:22:05.688098623 +0200
++++ libhpdf/hpdfimac.c	2015-09-09 21:22:05.688098623 +0200
+@@ -18,7 +18,7 @@
+ #include "hpdfconf.h"
  #include "hpdfutil.h"
  #include "hpdf.h"
- #include <memory.h>
+-#include <memory.h>
 +#include <string.h>
  #include <assert.h>
  
  #define	G3CODES
-@@ -78,7 +79,7 @@
+@@ -78,7 +78,7 @@
  
  #define	Fax3State(tif)		(&(tif)->tif_data->b)
  #define	EncoderState(tif)	((tif)->tif_data)
@@ -40,8 +41,8 @@ diff -urN libhpdf.orig/hpdfimac.c libhpdf/hpdfimac.c
  /* NB: the uint32 casts are to silence certain ANSI-C compilers */
  #define TIFFhowmany(x, y) ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y)))
 diff -urN libhpdf.orig/hpdfpago.c libhpdf/hpdfpago.c
---- libhpdf.orig/hpdfpago.c	2015-06-22 16:44:34.291421844 +0200
-+++ libhpdf/hpdfpago.c	2015-06-22 16:44:34.291421844 +0200
+--- libhpdf.orig/hpdfpago.c	2015-09-09 21:22:05.724098623 +0200
++++ libhpdf/hpdfpago.c	2015-09-09 21:22:05.724098623 +0200
 @@ -1155,7 +1155,7 @@
          return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
  
@@ -52,8 +53,8 @@ diff -urN libhpdf.orig/hpdfpago.c libhpdf/hpdfpago.c
      if (page->mmgr != font->mmgr)
          return HPDF_RaiseError (page->error, HPDF_PAGE_INVALID_FONT, 0);
 diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
---- libhpdf.orig/hpdfutil.h	2015-06-22 16:44:34.391421841 +0200
-+++ libhpdf/hpdfutil.h	2015-06-22 16:44:34.391421841 +0200
+--- libhpdf.orig/hpdfutil.h	2015-09-09 21:22:05.816098625 +0200
++++ libhpdf/hpdfutil.h	2015-09-09 21:22:05.816098625 +0200
 @@ -18,7 +18,7 @@
  #ifndef _HPDF_UTILS_H
  #define _HPDF_UTILS_H
@@ -64,8 +65,8 @@ diff -urN libhpdf.orig/hpdfutil.h libhpdf/hpdfutil.h
  
  #ifdef __cplusplus
 diff -urN libhpdf.orig/t4.h libhpdf/t4.h
---- libhpdf.orig/t4.h	2015-06-22 16:44:34.331421842 +0200
-+++ libhpdf/t4.h	2015-06-22 16:44:34.331421842 +0200
+--- libhpdf.orig/t4.h	2015-09-09 21:22:05.764098624 +0200
++++ libhpdf/t4.h	2015-09-09 21:22:05.764098624 +0200
 @@ -1,4 +1,4 @@
 -/* $Id: t4.h,v 1.20 2007/11/10 18:40:44 drolon Exp $ */
 +/* $Id$ */
diff --git a/include/hbdate.h b/include/hbdate.h
index 0a3ab3a55b..c4370dbd76 100644
--- a/include/hbdate.h
+++ b/include/hbdate.h
@@ -150,12 +150,24 @@ HB_EXTERN_END
 
 #define HB_TIMEDIFF_DEC       6     /* default number of decimal places in numeric timestamp diff values */
 
-#if ( defined( _POSIX_C_SOURCE ) || defined( _XOPEN_SOURCE ) || \
-      defined( _BSD_SOURCE ) || defined( _SVID_SOURCE ) || \
-      defined( HB_OS_SUNOS ) || defined( HB_OS_BEOS ) || \
-      defined( HB_OS_ANDROID ) ) && \
-   ! defined( HB_OS_DARWIN_5 ) && ! defined( HB_HAS_LOCALTIME_R )
-#  define HB_HAS_LOCALTIME_R
+#if ! defined( HB_HAS_LOCALTIME_R )
+#  if ( defined( _POSIX_C_SOURCE ) || defined( _XOPEN_SOURCE ) || \
+        defined( _BSD_SOURCE ) || defined( _SVID_SOURCE ) || \
+        defined( HB_OS_SUNOS ) || defined( HB_OS_BEOS ) || \
+        defined( HB_OS_ANDROID ) ) && \
+      ! defined( HB_OS_DARWIN_5 )
+#     define HB_HAS_LOCALTIME_R
+#  elif defined( __WATCOMC__ )
+#     if defined(__STDC_WANT_LIB_EXT1__) && __STDC_WANT_LIB_EXT1__ == 1
+#        define HB_HAS_LOCALTIME_R
+#        define localtime_r   localtime_s
+#        define gmtime_r      gmtime_s
+#     elif ! defined( NO_EXT_KEYS )
+#        define HB_HAS_LOCALTIME_R
+#        define localtime_r   _localtime
+#        define gmtime_r      _gmtime
+#     endif
+#  endif
 #endif
 
 #endif /* HB_DATE_H_ */