diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 4d9d591f..2a5800af 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-29 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* pgm.h: Fix prototype for gettimeofday().
+	Closes bug #17884: another gettimeofday conflict under win32/cygwin
+
 2006-09-24 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	Submitted by Thomas Fischl (initially):
diff --git a/avrdude/pgm.h b/avrdude/pgm.h
index cb644f89..8ab8365f 100644
--- a/avrdude/pgm.h
+++ b/avrdude/pgm.h
@@ -121,7 +121,7 @@ PROGRAMMER * pgm_new(void);
 */
 void usleep(unsigned long us);
 
-void gettimeofday(struct timeval*, void*z);
+void gettimeofday(struct timeval *tv, struct timezone *tz);
 
 #endif /* __win32native_h */