diff --git a/coreutils-getaddrinfo.diff b/coreutils-getaddrinfo.diff
new file mode 100644
index 0000000..4ab88ee
--- /dev/null
+++ b/coreutils-getaddrinfo.diff
@@ -0,0 +1,15 @@
+Index: coreutils-6.9.90/gnulib-tests/test-getaddrinfo.c
+===================================================================
+--- coreutils-6.9.90.orig/gnulib-tests/test-getaddrinfo.c	2007-11-17 07:59:42.000000000 +0100
++++ coreutils-6.9.90/gnulib-tests/test-getaddrinfo.c	2007-12-12 11:25:49.000000000 +0100
+@@ -61,6 +61,10 @@ int simple (char *host, char *service)
+       if (res == EAI_SERVICE)
+ 	return 0;
+ 
++      /* Do not fail this test for temporary name resolution errors.  */
++      if (res == EAI_AGAIN)
++	return 0;
++
+       return 1;
+     }
+ 
diff --git a/coreutils.changes b/coreutils.changes
index 2c29aa0..0fd777f 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 12 11:27:08 CET 2007 - rguenther@suse.de
+
+- adjust test-getaddrinfo to not fail w/o network connection
+
 -------------------------------------------------------------------
 Mon Dec 10 17:50:07 CET 2007 - ro@suse.de
 
diff --git a/coreutils.spec b/coreutils.spec
index d96a228..c989d24 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -20,7 +20,7 @@ Obsoletes:      libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit =
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Version:        6.9.90
-Release:        4
+Release:        6
 Summary:        GNU Core Utilities
 Source:         coreutils-%{version}.tar.bz2
 Source1:        su.pamd
@@ -38,6 +38,7 @@ Patch16:        invalid-ids.diff
 Patch20:        coreutils-6.8-su.diff
 Patch21:        coreutils-6.8.0-pie.diff
 Patch22:        coreutils-5.3.0-sbin4su.diff
+Patch23:        coreutils-getaddrinfo.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -105,6 +106,7 @@ Authors:
 %patch20
 %patch21
 %patch22
+%patch23 -p1
 
 %build
 AUTOPOINT=true autoreconf -fi
@@ -169,6 +171,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_prefix}/share/locale/*/LC_TIME
 
 %changelog
+* Wed Dec 12 2007 - rguenther@suse.de
+- adjust test-getaddrinfo to not fail w/o network connection
 * Mon Dec 10 2007 - ro@suse.de
 - change source archive compression back to .bz2 to avoid another
   dependency in the lowest basesystem