diff --git a/ChangeLog b/ChangeLog
index a47fa7009..bed704691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-09  Yanko Kaneti <yaneti@declera.com>
+
+	* capplets/common/capplet-util.h: handle different cases of
+	preprocessor macro varargs support.
+
 2002-08-08  Seth Nickell  <snickell@stanford.edu>
 
 	* capplets/Makefile.am:
diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h
index 1a556999c..d66f1d8d1 100644
--- a/capplets/common/capplet-util.h
+++ b/capplets/common/capplet-util.h
@@ -32,9 +32,17 @@
 
 /* Print a debugging message */
 
-#define DEBUG_MSG(str, ...) \
+#ifdef G_HAVE_ISO_VARARGS
+#  define DEBUG_MSG(str, ...) \
               g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
 		     getpid (), G_GNUC_FUNCTION, __VA_ARGS__)
+#elif defined(G_HAVE_GNUC_VARARGS)
+#  define DEBUG_MSG(str, args...) \
+              g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
+		     getpid (), G_GNUC_FUNCTION, args)
+#else
+#  define DEBUG_MSG(str, args...)
+#endif
 
 /* Retrieve a widget from the Glade object */