diff --git a/ChangeLog b/ChangeLog
index 75c7b00ea..ffab7ad37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 16 16:52:00 EET 2008 (edwin)
+------------------------------------
+  * libclamav/others.h: cannot use if in cli_dbgmsg() macro
+
 Sat Feb 16 13:45:01 EET 2008 (edwin)
 ------------------------------------
   * configure, configure.in: AC_TRY_COMPILE already wraps its args with int
diff --git a/libclamav/others.h b/libclamav/others.h
index 0611f1dc6..7237a82a4 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -217,7 +217,7 @@ void cli_errmsg(const char *str, ...);
 #define UNLIKELY(cond) (cond)
 #endif
 
-#define cli_dbgmsg if(UNLIKELY(cli_debug_flag)) cli_dbgmsg_internal
+#define cli_dbgmsg (!UNLIKELY(cli_debug_flag)) ? (void)0 : cli_dbgmsg_internal
 
 #ifdef __GNUC__
 void cli_dbgmsg_internal(const char *str, ...) __attribute__((format(printf, 1, 2)));