diff --git a/ares/CHANGES b/ares/CHANGES
index e597ed94a45f51217ad848cb19d3ad0d75e5e097..cd0c451d51819dca2e5a5b13d5c2191797b3cbbf 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* July 1
+- Gisle Vanem provided Makefile.dj to build with djgpp, added a few more djgpp
+  fixes and made ares not use 'errno' to provide further info on Windows.
+
 * June 30
 - Gisle Vanem made it build with djgpp and run fine with the Watt-32 stack.
 
diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index 7e91dce198e196de46435b1392ae680c73071254..5652145d98d50b9afaaf72f1c42f4636ac87c9ea 100644
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -151,6 +151,12 @@ static int file_lookup(struct in_addr *addr, struct hostent **host)
     strcat(PATH_HOSTS, PATH_HOSTS_9X);
   }
 
+#elif defined(WATT32)
+  extern const char *_w32_GetHostsFile (void);
+  const char *PATH_HOSTS = _w32_GetHostsFile();
+
+  if (!PATH_HOSTS)
+    return ARES_ENOTFOUND;
 #endif
 
   fp = fopen(PATH_HOSTS, "r");
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index accf962cfd4184bdcd7ba2f6722952e72014c5f9..0d06dfe939709b430afd6e165e899bb9279eac20 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -224,6 +224,12 @@ static int file_lookup(const char *name, struct hostent **host)
     strcat(PATH_HOSTS, PATH_HOSTS_9X);
   }
 
+#elif defined(WATT32)
+  extern const char *_w32_GetHostsFile (void);
+  const char *PATH_HOSTS = _w32_GetHostsFile();
+
+  if (!PATH_HOSTS)
+    return ARES_ENOTFOUND;
 #endif
 
   fp = fopen(PATH_HOSTS, "r");
diff --git a/ares/ares_private.h b/ares/ares_private.h
index caff53b345b336d7890620c768d45bfeaa0dea00..d8b7fd1d4c40a2911d19622abc9f20035e3bdd76 100644
--- a/ares/ares_private.h
+++ b/ares/ares_private.h
@@ -32,7 +32,6 @@
 #include <sys/ioctl.h>
 #undef  closesocket
 #define closesocket(s)    close_s(s)
-#define select(n,r,w,x,t) select_s(n,r,w,x,t)
 #define writev(s,v,c)     writev_s(s,v,c)
 #endif
 
@@ -51,7 +50,11 @@
 #define DHCPNAMESERVER "DhcpNameServer"
 #define PATH_HOSTS_NT  "\\drivers\\etc\\hosts"
 #define PATH_HOSTS_9X  "\\hosts"
-          
+
+#elif defined(WATT32)
+
+#define PATH_RESOLV_CONF "/dev/ENV/etc/resolv.conf"
+
 #else
 
 #define PATH_RESOLV_CONF	"/etc/resolv.conf"
diff --git a/ares/nameser.h b/ares/nameser.h
index b6c78aa6d7fdd97d49b746c65b0cc671512531f4..0311c7e6e3655087d98fca9a08584db602a9e0c7 100644
--- a/ares/nameser.h
+++ b/ares/nameser.h
@@ -11,6 +11,7 @@
 #define MAXHOSTNAMELEN 256
 
 #define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
 
 /* Structure for scatter/gather I/O.  */
 struct iovec