diff --git a/ChangeLog b/ChangeLog
index 80734547..6838b038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-11  Joel E. Denny  <jdenny@clemson.edu>
+
+	portability: use va_start and va_end in the same function.
+	* src/complain.c (error_message): Move va_end from here...
+	(ERROR_MESSAGE): ... to here.
+
 2009-10-04  Joel E. Denny  <jdenny@clemson.edu>
 
 	tests: skip tests of file names that platform does not support.
diff --git a/src/complain.c b/src/complain.c
index 801642b4..c5fd1a96 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -56,7 +56,6 @@ error_message (location *loc,
     fprintf (stderr, "%s: ", prefix);
 
   vfprintf (stderr, message, args);
-  va_end (args);
   putc ('\n', stderr);
   fflush (stderr);
 }
@@ -67,6 +66,7 @@ error_message (location *loc,
   va_list args;					\
   va_start (args, Message);			\
   error_message (Loc, Prefix, Message, args);	\
+  va_end (args);				\
 }