diff --git a/ChangeLog b/ChangeLog
index ef81776cc2..f271715077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* resolv/res_init.c (__res_vinit): Count all servers in	statp->nscount.
+
 2008-12-21  Bruno Haible  <bruno@clisp.org>
 
 	[BZ #9677]
diff --git a/resolv/res_init.c b/resolv/res_init.c
index 670ad23c22..2bf830cc95 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -420,7 +420,7 @@ __res_vinit(res_state statp, int preinit) {
 		    continue;
 		}
 	    }
-	    statp->nscount = nserv;
+	    statp->nscount = nservall;
 #ifdef _LIBC
 	    if (nservall - nserv > 0) {
 		statp->_u._ext.nscount6 = nservall - nserv;