diff --git a/ChangeLog b/ChangeLog
index bf2ba9953a..e2e012718b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* resolv/tst-leaks.c (TIMEOUT): Define so that if no server is
+	available the process is not killed. [BZ #41]
+
 	* intl/tst-gettext.c (main): Improve some messages. [BZ #33]
 
 	* time/strptime_l.c (__strptime_internal): Fix handling of %Ey.
diff --git a/resolv/tst-leaks.c b/resolv/tst-leaks.c
index 0a94514645..daad8fcb6d 100644
--- a/resolv/tst-leaks.c
+++ b/resolv/tst-leaks.c
@@ -1,5 +1,5 @@
 /* Tests for res_query in libresolv
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 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
@@ -26,6 +26,7 @@
 extern int do_test (int argc, char *argv[]);
 
 /* This defines the `main' function and some more.  */
+#define TIMEOUT 40
 #include <test-skeleton.c>
 
 int