diff --git a/ChangeLog b/ChangeLog
index a8df8b3ff..eb1df56ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov  3 00:25:52 EET 2007 (edwin)
+------------------------------------
+  * libclamav/ole2_extract.c: make endian conversion macros work when operand
+  is negative number.
+
 Fri Nov  2 00:16:27 CET 2007 (acab)
   * libclamav/autoit: final
 
diff --git a/libclamav/ole2_extract.c b/libclamav/ole2_extract.c
index feae64712..2d824cbe8 100644
--- a/libclamav/ole2_extract.c
+++ b/libclamav/ole2_extract.c
@@ -52,8 +52,8 @@
 #include "mbox.h"
 #include "blob.h" /* sanitiseName() */
 
-#define ole2_endian_convert_16(v) le16_to_host(v)
-#define ole2_endian_convert_32(v) le32_to_host(v)
+#define ole2_endian_convert_16(v) le16_to_host((uint16_t)(v))
+#define ole2_endian_convert_32(v) le32_to_host((uint32_t)(v))
 
 #ifndef HAVE_ATTRIB_PACKED
 #define __attribute__(x)