diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 883e06878..b3102dc5f 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 10 14:38:20 CET 2007 (tk)
+---------------------------------
+  * libclamav/others.h, shared/output.h: try to check coding styles for output
+					 functions, thanks to NJH
+
 Sat Feb 10 11:22:16 GMT 2007 (njh)
 ----------------------------------
   * libclamav/pdf.c:	Fix warning on 64bit machines
diff --git a/clamav-devel/libclamav/others.h b/clamav-devel/libclamav/others.h
index c052b54f0..439c5ca31 100644
--- a/clamav-devel/libclamav/others.h
+++ b/clamav-devel/libclamav/others.h
@@ -137,9 +137,24 @@ typedef struct bitset_tag
         unsigned long length;
 } bitset_t;
 
+#ifdef __GNUC__
+void cli_warnmsg(const char *str, ...) __attribute__((format(printf, 1, 2)));
+#else
 void cli_warnmsg(const char *str, ...);
+#endif
+
+#ifdef __GNUC__
+void cli_errmsg(const char *str, ...) __attribute__((format(printf, 1, 2)));
+#else
 void cli_errmsg(const char *str, ...);
+#endif
+
+#ifdef __GNUC__
+void cli_dbgmsg(const char *str, ...) __attribute__((format(printf, 1, 2)));
+#else
 void cli_dbgmsg(const char *str, ...);
+#endif
+
 void *cli_malloc(size_t nmemb);
 void *cli_calloc(size_t nmemb, size_t size);
 void *cli_realloc(void *ptr, size_t size);
diff --git a/clamav-devel/shared/output.h b/clamav-devel/shared/output.h
index 5ab2dbeb2..c7195f0b7 100644
--- a/clamav-devel/shared/output.h
+++ b/clamav-devel/shared/output.h
@@ -29,7 +29,12 @@
 
 int mdprintf(int desc, const char *str, ...);
 
+#ifdef __GNUC__
+int logg(const char *str, ...)      __attribute__((format(printf, 1, 2)));
+#else
 int logg(const char *str, ...);
+#endif
+
 void logg_close(void);
 extern short int logg_verbose, logg_lock, logg_time;
 extern int logg_size;
@@ -40,7 +45,12 @@ extern short logg_syslog;
 int logg_facility(const char *name);
 #endif
 
+#ifdef __GNUC__
+void mprintf(const char *str, ...) __attribute__((format(printf, 1, 2)));
+#else
 void mprintf(const char *str, ...);
+#endif
+
 extern short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_stdout;
 
 #endif