diff --git a/ChangeLog b/ChangeLog
index 2ffbc3c955..de0bd4e62c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-08-21  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/hstcache.c (cache_addhst): Minimal optimization.
+
 	[BZ #4925]
 	* debug/pcprofiledump.c: Turn on internationalization by calling
 	setlocale.  Patch mostly by Benno Schulenberg.
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 3c9a17fee8..65adf318c5 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -221,7 +221,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
 	 the current cache handling cannot handle and it is more than
 	 questionable whether it is worthwhile complicating the cache
 	 handling just for handling such a special case. */
-      if (he == NULL && hst->h_addr_list[1] == NULL)
+      if (he == NULL && h_addr_list_cnt == 1)
 	{
 	  dataset = (struct dataset *) mempool_alloc (db,
 						      total + req->key_len);