diff --git a/src/ChangeLog b/src/ChangeLog
index 5117f7a8..00a440b1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-12  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* config.h.in: Define _VA_LIST on Solaris to prevent stdio.h from
+	declaring va_list.
+	From Kevin Rodgers <kevinr@ihs.com>.
+
 2002-04-12  Ian Abbott  <abbotti@mev.co.uk>
 
 	* Makefile.in: Specify libtool mode explicitly when linking.
diff --git a/src/config.h.in b/src/config.h.in
index 642b94e0..2252bdda 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -257,6 +257,8 @@ char *alloca ();
 
 #ifdef solaris
 # define NAMESPACE_TWEAKS
+/* Prevent stdio.h from declaring va_list. */
+# define _VA_LIST
 #endif
 
 #ifdef __linux__