diff --git a/CHANGES b/CHANGES
index eee1bb3ac8d03d1a86ace10a2ea46119943f84cb..6cf3d624f352580707d68a53ece721e24165eee5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel (23 June 2006)
+- Arve Knudsen found a flaw in curl_multi_fdset() for systems where
+  curl_socket_t is unsigned (like Windows) that could cause it to wrongly
+  return a max fd of -1.
+
 Daniel (20 June 2006)
 - Peter Silva introduced CURLOPT_MAX_SEND_SPEED_LARGE and
   CURLOPT_MAX_RECV_SPEED_LARGE that limit tha maximum rate libcurl is allowed
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7936724eff4f47cae0e060c4fb9536100b129276..03bf9a6a1b66dfcacf83fde2fab5b032df34c418 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o curl_multi_fdset() could return a crazy max_fd value
  o Made -K on a file that couldn't be read cause a warning to be displayed.
 
 Other curl-related news:
@@ -30,6 +31,6 @@ New curl mirrors:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Dan Fandrich, Peter Silva
+ Dan Fandrich, Peter Silva, Arve Knudsen
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/multi.c b/lib/multi.c
index 9201402a26f56a67bcae6739ae4a36f8cb40b4eb..cfb749dfd96580cf9931548406dcc8e663c69e18 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -504,7 +504,7 @@ CURLMcode curl_multi_fdset(CURLM *multi_handle,
         /* this socket is unused, break out of loop */
         break;
       else {
-        if(s > (curl_socket_t)this_max_fd)
+        if((int)s > this_max_fd)
           this_max_fd = (int)s;
       }
     }