diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 2c5c8c284..a5bcb7d70 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-13  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_finger.c (connect_server): Use INADDR_NONE instead of
+	SOCKET_ERROR.  Noted by Timo.
+
 2005-01-09  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_curl.c (get_key): Newer versions of libcurl don't define
diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c
index 303e636eb..cf06feccf 100644
--- a/keyserver/gpgkeys_finger.c
+++ b/keyserver/gpgkeys_finger.c
@@ -120,7 +120,7 @@ connect_server (const char *server, unsigned short port)
 
   /* Win32 gethostbyname doesn't handle IP addresses internally, so we
      try inet_addr first on that platform only. */
-  if ((l = inet_addr (server)) != SOCKET_ERROR) 
+  if ((l = inet_addr (server)) != INADDR_NONE) 
     memcpy (&addr.sin_addr, &l, sizeof l);
   else if ((hp = gethostbyname (server))) 
     {