diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f58c5d04b50..d54f8adaac5 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (main): Fix mindless breakage where emacsclient
+	does not work *at all* on Windows, even if it *can* connect.
+
 2008-12-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* emacsclient.c (EMACS_DAEMON): Remove definition.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 56e8b5b9859..19812784a7b 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1519,8 +1519,10 @@ main (argc, argv)
       }
     else
       fail ();
+#ifndef WINDOWSNT
   else
     fail ();
+#endif
 
   cwd = get_current_dir_name ();
   if (cwd == 0)