diff --git a/ares/CHANGES b/ares/CHANGES
index 1755907b878d39676d78450c95c3a55e5538b649..b4580c77397466c89dff7e4e17529c65d4899770 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* May 25 2007
+- Ravi Pratap fixed a flaw in the init_by_resolv_conf() function for windows
+  that could cause it to return a bad return code.
+
 * April 16 2007
 
 - Yang Tse: Provide ares_getopt() command-line parser function as a source
diff --git a/ares/ares_init.c b/ares/ares_init.c
index 552f51f48e859282bdbe4f7949018124e814378b..bfe6b904ca4dfa0fd31817d27b0bab87766844ae 100644
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -555,6 +555,10 @@ DhcpNameServer
 
   if (status == ARES_SUCCESS)
     status = ARES_EOF;
+  else
+    /* Catch the case when all the above checks fail (which happens when there
+       is no network card or the cable is unplugged) */
+    status = ARES_EFILE;
 
 #elif defined(__riscos__)