diff --git a/ChangeLog b/ChangeLog
index a2a89f48e1..13e7092552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* nss/bug-erange.c (main): Don't fail if /etc/resolv.conf doesn't
+	exist.
+
+2002-09-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* nss/Makefile: Move bug-erage from tests to xtests.
+
 2002-09-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* stdlib/longlong.h (__udiv_qrnnd): Remove PARAMS from prototype.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index dc6cf2330a..4c78587fa8 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/useldt.h (DO_SET_THREAD_AREA): Don't use
+	INLINE_SYSCALL for set_thread_area syscall.
+
 2002-09-28  Roland McGrath  <roland@redhat.com>
 
 	* pthread.c (__pthread_reset_main_thread) [FLOATING_STACKS]:
diff --git a/nss/Makefile b/nss/Makefile
index 1a24482196..320fbbd9f1 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,2000,2001,2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -39,7 +39,8 @@ databases		= proto service hosts network grp pwd rpc ethers \
 others                  := getent
 install-bin             := getent
 
-tests			= test-netdb bug-erange
+tests			= test-netdb
+xtests			= bug-erange
 
 include ../Makeconfig
 
diff --git a/nss/bug-erange.c b/nss/bug-erange.c
index 5e535a0fe4..b709418b5c 100644
--- a/nss/bug-erange.c
+++ b/nss/bug-erange.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 int
 main (void)
@@ -35,6 +36,13 @@ main (void)
   if (res != 0 || hp == NULL)
     {
       printf ("gethostbyname_r failed: %s (errno: %m)\n", strerror (res));
+
+      if (access ("/etc/resolv.conf", R_OK))
+	{
+	  puts ("DNS probably not set up");
+	  return 0;
+	}
+
       return 1;
     }