diff --git a/ChangeLog b/ChangeLog
index 69f134d0fa..b453585a90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-20  Andreas Schwab  <schwab@redhat.com>
+
+	* resolv/res_query.c (__libc_res_nquerydomain): Use size_t for
+	strlen results.
+
 2011-07-13  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
diff --git a/resolv/res_query.c b/resolv/res_query.c
index 26daf0d87b..2f7cfaa4b7 100644
--- a/resolv/res_query.c
+++ b/resolv/res_query.c
@@ -543,7 +543,7 @@ __libc_res_nquerydomain(res_state statp,
 {
 	char nbuf[MAXDNAME];
 	const char *longname = nbuf;
-	int n, d;
+	size_t n, d;
 
 #ifdef DEBUG
 	if (statp->options & RES_DEBUG)