diff --git a/mozilla/netwerk/dns/daemon/Makefile.in b/mozilla/netwerk/dns/daemon/Makefile.in
index a06146d8bcf..23cc4f3224a 100644
--- a/mozilla/netwerk/dns/daemon/Makefile.in
+++ b/mozilla/netwerk/dns/daemon/Makefile.in
@@ -34,5 +34,5 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES		+= -D"GETHOSTBYNAME_DELAY=5"
+DEFINES		+= -D"GETHOSTBYNAME_DELAY=5" -DNO_SOCKS_NS_KLUDGE
 
diff --git a/mozilla/netwerk/dns/daemon/nsDnsAsyncLookup.cpp b/mozilla/netwerk/dns/daemon/nsDnsAsyncLookup.cpp
index 4582fbdedbb..0bf0d2e9dd7 100644
--- a/mozilla/netwerk/dns/daemon/nsDnsAsyncLookup.cpp
+++ b/mozilla/netwerk/dns/daemon/nsDnsAsyncLookup.cpp
@@ -55,7 +55,7 @@
 #include <sys/un.h>
 #include "unix_dns.h"
 
-#if defined(AIX)
+#if defined(AIX) || defined(__linux)
 #include <sys/select.h>         // for fd_set
 #endif
 
@@ -65,7 +65,10 @@
 #include <resolv.h>             // for res_init() and _res
 #endif
 
-#if !defined(__irix)
+#if defined(__linux)
+// Didn't find gettdtablehi() or gettdtablesize() on linux. Using FD_SETSIZE
+#define getdtablehi() FD_SETSIZE
+#elif !defined(__irix)
 // looks like Irix is the only one that has getdtablehi()?
 #define getdtablehi() getdtablesize()
 
@@ -544,7 +547,7 @@ int main (int argc, char **argv)
                 if (!(strncmp (buffer, "shutdown:", 9)))
                     break;
 
-                char *name = index (buffer, ' ');
+                char *name = strchr ((const char *)buffer, ' ');
                 if (name && *name)
                     name++;