diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index de15c3d29d5..e2eb418327e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-09  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (w32_execvp): Declare execvp to silence the compiler.
+
 2012-07-09  Juanma Barranquero  <lekktu@gmail.com>
 
 	* makefile.w32-in ($(BLD)/test-distrib.exe): Use LIB_SRC, not SRC.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 46a4fdb26e7..5487c147079 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -463,6 +463,7 @@ int
 w32_execvp (const char *path, char **argv)
 {
   int i;
+  extern int execvp (const char*, char **);
 
   /* Required to allow a .BAT script as alternate editor.  */
   argv[0] = (char *) alternate_editor;