diff --git a/CHANGES b/CHANGES
index 91e227f2d0395277164ef5fa53531334e75dd031..7e281d4a437f40b313ca03dff9a63e78f21952c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@
 
 
 Daniel (3 December)
+- Steve Green fixed a return code bug in Curl_resolv(), that made the socks5
+  code fail.
+
 - swalkaus at yahoo.com patched libcurl to ignore Content-Length: headers
   when Tranfer-Encoding: chunked is used, as mandated by RFC2616.
 
diff --git a/lib/hostip.c b/lib/hostip.c
index 3e5429b702085ebe496f334779cbbb0bd3a19175..114525c3de509c909d95510f2b6aeecb747da38f 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -352,6 +352,8 @@ int Curl_resolv(struct connectdata *conn,
         /* returned failure, bail out nicely */
         Curl_freeaddrinfo(addr);
       }
+      else
+        rc = 0;
     }
   }